Merge branch '10.6' into 10.9

mysql-test/main/delayed.test

@@ -611,7 +611,6 @@ disconnect con1;
 --source include/wait_until_disconnected.inc
 connection default;
 drop tables tm, t1, t2;
---enable_view_protocol
 
 --echo #
 --echo # MDEV-9621 INSERT DELAYED fails on insert for tables with many columns
@@ -660,3 +659,4 @@ INSERT DELAYED INTO t1 VALUES (0);
 INSERT DELAYED INTO t1 VALUES (0);
 DROP TABLE t1;
 
+--enable_view_protocol

mysql-test/main/distinct.result

@@ -1180,5 +1180,16 @@ a
 1
 drop table t1,t2;
 #
+# MDEV-31743 Server crash in store_length, assertion failure in
+#            Type_handler_string_result::sort_length
+#
+create table t1 (a int, b longtext, c varchar(18));
+insert into t1 values (1, 'Aa123456', 'abc'), (2, 'Bb7897777', 'def'),
+(3, 'Cc01287', 'xyz'), (5, 'd12345', 'efg');
+select distinct if(sum(a), b, 0) from t1 group by value(c) with rollup;
+if(sum(a), b, 0)
+Aa123456
+drop table t1;
+#
 # end of 10.5 tests
 #

mysql-test/main/distinct.test

@@ -914,6 +914,18 @@ select distinct a from t1 where t1.a=1 and t1.a in (select a+0 from t2 where t2.
 select distinct a from t1 where t1.a=1 and t1.a in (select a+0 from t2 where t2.b in (1,2)) limit 0,1;
 drop table t1,t2;
 
+--echo #
+--echo # MDEV-31743 Server crash in store_length, assertion failure in
+--echo #            Type_handler_string_result::sort_length
+--echo #
+
+create table t1 (a int, b longtext, c varchar(18));
+insert into t1 values (1, 'Aa123456', 'abc'), (2, 'Bb7897777', 'def'),
+  (3, 'Cc01287', 'xyz'), (5, 'd12345', 'efg');
+
+select distinct if(sum(a), b, 0) from t1 group by value(c) with rollup;
+drop table t1;
+
 --echo #
 --echo # end of 10.5 tests
 --echo #

sql/filesort.cc

@@ -2289,7 +2289,8 @@ sortlength(THD *thd, Sort_keys *sort_keys, bool *allow_packing_for_sortkeys)
       set_if_smaller(sortorder->length, thd->variables.max_sort_length);
       set_if_smaller(sortorder->original_length, thd->variables.max_sort_length);
     }
-    length+=sortorder->length;
+    DBUG_ASSERT(length < UINT_MAX32 - sortorder->length);
+    length+= sortorder->length;
 
     sort_keys->increment_size_of_packable_fields(sortorder->length_bytes);
     sort_keys->increment_original_sort_length(sortorder->original_length);

sql/sql_select.cc

@@ -25188,6 +25188,9 @@ JOIN_TAB::remove_duplicates()
       {
         /* Item is not stored in temporary table, remember it */
         sorder->item= item;
+        sorder->type= sorder->item->type_handler()->is_packable() ?
+                      SORT_FIELD_ATTR::VARIABLE_SIZE :
+                      SORT_FIELD_ATTR::FIXED_SIZE;
         /* Calculate sorder->length */
         item->type_handler()->sort_length(thd, item, sorder);
         sorder++;

storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result

@@ -20,7 +20,7 @@ set @tmp1=@@rocksdb_verify_row_debug_checksums;
 set rocksdb_verify_row_debug_checksums=1;
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read1";
 select * from t1 where pk=1;
-ERROR HY000: Got error 204 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 205 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read1";
 set rocksdb_verify_row_debug_checksums=@tmp1;
 select * from t1 where pk=1;
@@ -28,11 +28,11 @@ pk	col1
 1	1
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read2";
 select * from t1 where pk=1;
-ERROR HY000: Got error 204 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 205 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read2";
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read3";
 select * from t1 where pk=1;
-ERROR HY000: Got error 204 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 205 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read3";
 insert into t1 values(4,'0123456789');
 select * from t1;
@@ -56,7 +56,7 @@ pk	col1
 ABCD	1
 set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
 select * from t2;
-ERROR HY000: Got error 204 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 205 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
 drop table t2;
 create table t2 (
@@ -69,6 +69,6 @@ pk	col1
 ABCD	1
 set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
 select * from t2;
-ERROR HY000: Got error 204 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 205 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
 drop table t2;

storage/spider/ha_spider.cc

@@ -433,12 +433,12 @@ int ha_spider::open(
       wide_handler->sql_command =
         pt_clone_source_handler->wide_handler->sql_command;
     }
-  } else {
-    if (share->semi_table_lock)
-    {
-      wide_handler->semi_table_lock = TRUE;
-    }
-  }
+  } else
+    wide_handler->semi_table_lock =
+      spider_param_semi_table_lock(thd, share->semi_table_lock);
+#ifdef HA_CAN_BULK_ACCESS
+  external_lock_cnt = 0;
+#endif
 
   if (reset())
   {

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mariadb.result

@@ -50,7 +50,7 @@ pkey
 connection child2_1;
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%';
 argument
-set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length,empty_string_is_null,simultaneous_assignment,time_round_fractional';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-'
+set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length,empty_string_is_null,simultaneous_assignment,time_round_fractional';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-';start transaction
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mysql.result

@@ -50,7 +50,7 @@ pkey
 connection child2_1;
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%';
 argument
-set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-'
+set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-';start transaction
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey

storage/spider/spd_param.cc

@@ -912,14 +912,6 @@ static MYSQL_THDVAR_INT(
 
 SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, buffer_size)
 
-/*
-  Notes on merge conflicts (remove after merging):
-  10.5: 48faa20db848012e2187a09e05aba832078cb82e
-  10.6: 51ff9eddf7c0aaf1e022fcb3b48ec36835df7785
-  10.9: 06a61b8e453126c2de1649073f247d34e85f9702
-  10.10: 90cd0c156f5bb53fd058d2bbfb83f850ffae6722
-  10.11+: 124eb662700708f3c4b0fb77968f8b854d6bb4aa
-*/
 /*
  -1 :fallback to default
   0 :off
@@ -2500,7 +2492,7 @@ static MYSQL_THDVAR_BOOL(
 SPIDER_THDVAR_VALUE_FUNC(bool, sync_sql_mode)
 
 /*
- -1 : use table parameter
+ -1 : fallback to default
   0 : do not strict
   1 : do strict
  */
@@ -2516,14 +2508,7 @@ static MYSQL_THDVAR_INT(
   0 /* blk */
 );
 
-int spider_param_strict_group_by(
-  THD *thd,
-  int strict_group_by
-) {
-  DBUG_ENTER("spider_param_strict_group_by");
-  DBUG_RETURN(THDVAR(thd, strict_group_by) == -1 ?
-    strict_group_by : THDVAR(thd, strict_group_by));
-}
+SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, strict_group_by)
 
 static struct st_mysql_storage_engine spider_storage_engine =
 { MYSQL_HANDLERTON_INTERFACE_VERSION };