Merge branch '10.4' into 10.5

Author: sanja-byelkin

extra/innochecksum.cc

@@ -1193,11 +1193,15 @@ print_summary(
 fprintf(fil_out, "index_id\t#pages\t\t#leaf_pages\t#recs_per_page"
 "\t#bytes_per_page\n");
 
-for (std::map<unsigned long long, per_index_stats>::const_iterator it = index_ids.begin();
- it != index_ids.end(); it++) {
-const per_index_stats& index = it->second;
+for (const auto &ids : index_ids) {
+const per_index_stats& index = ids.second;
+if (!index.pages) {
+DBUG_ASSERT(index.free_pages);
+continue;
+}
+
 fprintf(fil_out, "%lld\t\t%lld\t\t%lld\t\t%lld\t\t%lld\n",
-it->first, index.pages, index.leaf_pages,
+ids.first, index.pages, index.leaf_pages,
 index.total_n_recs / index.pages,
 index.total_data_bytes / index.pages);
 }

extra/wolfssl/CMakeLists.txt

@@ -147,7 +147,9 @@ IF(WOLFSSL_X86_64_BUILD)
  LIST(APPEND WOLFCRYPT_SOURCES ${WOLFCRYPT_SRCDIR}/cpuid.c)
  IF(MSVC)
  SET(WOLFSSL_AESNI 1)
- LIST(APPEND WOLFCRYPT_SOURCES ${WOLFCRYPT_SRCDIR}/aes_asm.asm)
+ LIST(APPEND WOLFCRYPT_SOURCES
+ ${WOLFCRYPT_SRCDIR}/aes_asm.asm
+ ${WOLFCRYPT_SRCDIR}/aes_gcm_asm.asm)
  IF(CMAKE_C_COMPILER_ID MATCHES Clang)
  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -msse4.2 -mpclmul -mrdrnd -mrdseed")
  ENDIF()

extra/wolfssl/wolfssl

@@ -250,11 +250,30 @@ static inline void lex_string_set3(LEX_CSTRING *lex_str, const char *c_str,
 static inline int safe_strcpy(char *dst, size_t dst_size, const char *src)
 {
  DBUG_ASSERT(dst_size > 0);
- /* Note, strncpy will zerofill end of dst if src shorter than dst_size */
+
+ /* 1) IF there is a 0 byte in the first dst_size bytes of src, strncpy will
+ * 0-terminate dst, and pad dst with additional 0 bytes out to dst_size.
+ *
+ * 2) IF there is no 0 byte in the first dst_size bytes of src, strncpy will
+ * copy dst_size bytes, and the final byte won't be 0.
+ *
+ * In GCC 8+, the `-Wstringop-truncation` warning will object to strncpy()
+ * being used in this way, so we need to disable this warning for this
+ * single statement.
+ */
+
+#if defined(__GNUC__) && __GNUC__ >= 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
  strncpy(dst, src, dst_size);
+#if defined(__GNUC__) && __GNUC__ >= 8
+#pragma GCC diagnostic pop
+#endif
+
  if (dst[dst_size-1])
  {
- /* Ensure string is zero terminated */
+ /* Only possible in case (2), meaning src was truncated. */
  dst[dst_size-1]= 0;
  return 1;
  }

include/m_string.h

@@ -446,6 +446,7 @@ enum ha_base_keytype {
 #define HA_ERR_CRASHED126/* Indexfile is crashed */
 #define HA_ERR_WRONG_IN_RECORD127/* Record-file is crashed */
 #define HA_ERR_OUT_OF_MEM128/* Out of memory */
+#define HA_ERR_RETRY_INIT 129 /* Initialization failed and should be retried */
 #define HA_ERR_NOT_A_TABLE 130 /* not a MYI file - no signature */
 #define HA_ERR_WRONG_COMMAND131/* Command not supported */
 #define HA_ERR_OLD_FILE132/* old databasfile */

include/my_base.h

@@ -281,7 +281,7 @@ enum enum_indicator_type
 #define CLIENT_DEPRECATE_EOF (1ULL << 24)
 
 #define CLIENT_PROGRESS_OBSOLETE (1ULL << 29)
-#define CLIENT_SSL_VERIFY_SERVER_CERT (1ULL << 30)
+#define CLIENT_SSL_VERIFY_SERVER_CERT_OBSOLETE (1ULL << 30)
 /*
  It used to be that if mysql_real_connect() failed, it would delete any
  options set by the client, unless the CLIENT_REMEMBER_OPTIONS flag was
@@ -334,7 +334,6 @@ enum enum_indicator_type
  CLIENT_MULTI_STATEMENTS | \
  CLIENT_MULTI_RESULTS | \
  CLIENT_PS_MULTI_RESULTS | \
- CLIENT_SSL_VERIFY_SERVER_CERT | \
  CLIENT_REMEMBER_OPTIONS | \
  MARIADB_CLIENT_PROGRESS | \
  CLIENT_PLUGIN_AUTH | \
@@ -352,9 +351,8 @@ enum enum_indicator_type
  If any of the optional flags is supported by the build it will be switched
  on before sending to the client during the connection handshake.
 */
-#define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
- & ~CLIENT_COMPRESS) \
- & ~CLIENT_SSL_VERIFY_SERVER_CERT)
+#define CLIENT_BASIC_FLAGS ((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
+ & ~CLIENT_COMPRESS)
 
 enum mariadb_field_attr_t
 {

include/mysql_com.h

@@ -44,6 +44,7 @@ struct st_mysql_options_extention {
  struct mysql_async_context *async_context;
  HASH connection_attributes;
  size_t connection_attributes_length;
+ my_bool tls_verify_server_cert;
 };
 
 typedef struct st_mysql_methods

include/sql_common.h

@@ -5799,4 +5799,52 @@ a	a
 9	9
 10	10
 drop table t1;
+#
+# MDEV-20010 Equal on two RANK window functions create wrong result
+#
+create table t1 (a int, b int) engine= innodb;
+insert into t1 values (4, -2), (3, -1);
+SELECT RANK() OVER (ORDER BY D.C) = RANK() OVER (ORDER BY B.a) FROM
+(SELECT 5 AS C FROM t1) as D, (SELECT t1.b AS A FROM t1) AS B;
+RANK() OVER (ORDER BY D.C) = RANK() OVER (ORDER BY B.a)
+1
+1
+0
+0
+select b, rank() over (order by c) , rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+b	rank() over (order by c)	rank() over (order by dt1.b)
+-2	1	1
+-2	1	1
+-1	1	3
+-1	1	3
+select b, rank() over (order by c) , rank() over (order by dt1.b),
+rank() over (order by c) = rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+b	rank() over (order by c)	rank() over (order by dt1.b)	rank() over (order by c) = rank() over (order by dt1.b)
+-2	1	1	1
+-2	1	1	1
+-1	1	3	0
+-1	1	3	0
+alter table t1 engine=myisam;
+select b, rank() over (order by c) , rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+b	rank() over (order by c)	rank() over (order by dt1.b)
+-2	1	1
+-2	1	1
+-1	1	3
+-1	1	3
+create view v1 as select b,5 as c from t1;
+select b, rank() over (order by c) from v1 order by b;
+b	rank() over (order by c)
+-2	1
+-1	1
+drop view v1;
+drop table t1;
 # End of 10.4 tests

libmariadb

@@ -2,6 +2,7 @@
 # This is too slow on MSAN
 --source include/not_msan.inc
 --source include/not_valgrind.inc
+--source include/have_innodb.inc
 
 create table t1 (a int, b varchar(32));
 insert into t1 values
@@ -4016,4 +4017,37 @@ with cte_e as (
 
 drop table t1;
 
+--echo #
+--echo # MDEV-20010 Equal on two RANK window functions create wrong result
+--echo #
+
+create table t1 (a int, b int) engine= innodb;
+insert into t1 values (4, -2), (3, -1);
+
+SELECT RANK() OVER (ORDER BY D.C) = RANK() OVER (ORDER BY B.a) FROM
+(SELECT 5 AS C FROM t1) as D, (SELECT t1.b AS A FROM t1) AS B;
+
+select b, rank() over (order by c) , rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+
+select b, rank() over (order by c) , rank() over (order by dt1.b),
+rank() over (order by c) = rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+
+alter table t1 engine=myisam;
+select b, rank() over (order by c) , rank() over (order by dt1.b)
+from
+(select 5 as c from t1) as dt,
+(select b from t1) as dt1;
+
+create view v1 as select b,5 as c from t1;
+select b, rank() over (order by c) from v1 order by b;
+
+drop view v1;
+drop table t1;
+
 --echo # End of 10.4 tests