Merge branch '12.2.1' into 12.2

vuvova · vuvova · commit b15d1adf85c5 · 2025-11-22T19:41:27.000+01:00
diff --git a/mysql-test/main/delete.result b/mysql-test/main/delete.result
@@ -779,6 +779,22 @@ id
 Warnings:
 Warning	4207	Index hints are ignored because they are incompatible with RETURNING clause
 drop table t2;
-#
 # End of 11.4 test
 #
+# MDEV-38068 Query doesn't delete all data it should after update to 11.8.4
+#
+create table t1 (id varchar(32), d1 char, key (id), key (d1)) engine=myisam;
+insert into t1 values ('1','A'), ('1','B'), ('1','C'), ('2','D'), ('2','E');
+select count(*) from t1;
+count(*)
+5
+need "range" below
+explain delete from t1 where id = '1';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	id	id	131	NULL	3	Using where
+delete from t1 where id = '1';
+select count(*) from t1;
+count(*)
+2
+drop table t1;
+# End of 11.8 test
diff --git a/mysql-test/main/delete.test b/mysql-test/main/delete.test
@@ -825,6 +825,18 @@ DELETE FROM t2 ignore index(primary) ORDER BY (id) LIMIT 2 RETURNING id;
 
 drop table t2;
 
---echo #
 --echo # End of 11.4 test
+
 --echo #
+--echo # MDEV-38068 Query doesn't delete all data it should after update to 11.8.4
+--echo #
+create table t1 (id varchar(32), d1 char, key (id), key (d1)) engine=myisam;
+insert into t1 values ('1','A'), ('1','B'), ('1','C'), ('2','D'), ('2','E');
+select count(*) from t1;
+--echo need "range" below
+explain delete from t1 where id = '1';
+delete from t1 where id = '1';
+select count(*) from t1;
+drop table t1;
+
+--echo # End of 11.8 test
diff --git a/mysql-test/main/mdev_32854.result b/mysql-test/main/mdev_32854.result
@@ -452,3 +452,14 @@ SELECT JSON_VALUE(@json_doc_arr_lev45_valid, '$[1][1][1][1][1][1][1][1][1][1][1]
 JSON_VALUE(@json_doc_arr_lev45_valid, '$[1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1]')
 45
 DROP TABLE t1 ,t2;
+#
+# MDEV-37082: Sig 11 in json_normalize_sort
+#
+CREATE TABLE t (a JSON)Engine=InnoDB;
+INSERT INTO t VALUES (CONCAT (REPEAT('{"v":',5000),'1',REPEAT('}',5000)));
+INSERT INTO t VALUES (CONCAT (REPEAT('[',5000),'1',REPEAT(']',5000)));
+SELECT JSON_EQUALS (a,a) FROM t;
+JSON_EQUALS (a,a)
+1
+1
+DROP TABLE t;
diff --git a/mysql-test/main/mdev_32854.test b/mysql-test/main/mdev_32854.test
@@ -90,7 +90,6 @@ SELECT JSON_SCHEMA_VALID(@json_schema, @json_doc_obj_lev45_valid) AS found_path;
 SELECT JSON_SCHEMA_VALID(@json_schema, @json_doc_obj_lev45_valid2);
 
 
-
 SELECT JSON_SEARCH(@json_doc_obj_lev45_valid,'one', 'This is level 45');
 
 SET @json_updated = JSON_SET(@json_doc_obj_lev45_valid, 
@@ -111,3 +110,18 @@ SELECT JSON_VALUE(@json_doc_obj_lev45_valid, '$.level1.level2.level3.level4.leve
 SELECT JSON_VALUE(@json_doc_arr_lev45_valid, '$[1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1][1]');
 
 DROP TABLE t1 ,t2;
+
+--echo #
+--echo # MDEV-37082: Sig 11 in json_normalize_sort
+--echo #
+
+--source include/have_innodb.inc
+
+CREATE TABLE t (a JSON)Engine=InnoDB;
+
+INSERT INTO t VALUES (CONCAT (REPEAT('{"v":',5000),'1',REPEAT('}',5000)));
+INSERT INTO t VALUES (CONCAT (REPEAT('[',5000),'1',REPEAT(']',5000)));
+
+SELECT JSON_EQUALS (a,a) FROM t;
+
+DROP TABLE t;
diff --git a/mysql-test/main/null_aware_cardinality.result b/mysql-test/main/null_aware_cardinality.result
@@ -1,4 +1,3 @@
-SET @session_start_value = @@new_mode;
 # Small driving table
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1, 1), (2, 2000),(3,300);
@@ -14,9 +13,6 @@ ANALYZE TABLE t2 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	Engine-independent statistics collected
 test.t2	analyze	status	Table is already up to date
-SET @@new_mode = "FIX_INDEX_STATS_FOR_ALL_NULLS";
-Warnings:
-Warning	4200	The setting 'new_mode=FIX_INDEX_STATS_FOR_ALL_NULLS' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 # NULL-rejecting equality t1.b = t2.b will not return any matches
 # because all values of t2.b are NULL. So "rows" = 1 for t2 where 1 is
 # a special value meaning "very few" rows
@@ -82,23 +78,12 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t3	ref	key_ab	key_ab	10	test.t1.a,const	11	100.00	Using where; Using index
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from `test`.`t1` join `test`.`t3` where `test`.`t3`.`a` = `test`.`t1`.`a` and `test`.`t3`.`b` is null
-# In the old mode (null-aware estimation is not enabled), "rows" > 1
-SET @@new_mode = "";
-EXPLAIN EXTENDED SELECT * FROM t1 JOIN t2 ON t1.a = t2.a AND t1.b = t2.b;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
-1	SIMPLE	t2	ref	key_b	key_b	5	test.t1.b	100	100.00	Using where
-Warnings:
-Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where `test`.`t2`.`a` = `test`.`t1`.`a` and `test`.`t2`.`b` = `test`.`t1`.`b`
 # Insert some non-NULL values and re-collect the stats
 INSERT INTO t3 SELECT 1, 1 FROM seq_1_to_100;
 ANALYZE TABLE t3 PERSISTENT FOR COLUMNS (b) INDEXES (key_ab);
 Table	Op	Msg_type	Msg_text
 test.t3	analyze	status	Engine-independent statistics collected
 test.t3	analyze	status	OK
-SET @@new_mode = "FIX_INDEX_STATS_FOR_ALL_NULLS";
-Warnings:
-Warning	4200	The setting 'new_mode=FIX_INDEX_STATS_FOR_ALL_NULLS' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 EXPLAIN EXTENDED SELECT * FROM t1 JOIN t3 ON t1.a = t3.a AND t1.b = t3.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
@@ -158,5 +143,4 @@ EXPLAIN SELECT * FROM t1, t2 WHERE t2.a=t1.a AND t2.b=t1.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	Using where
 1	SIMPLE	t2	ref	i1	i1	66	test.t1.a,test.t1.a	1	Using where
-SET @@new_mode = @session_start_value;
 DROP TABLE t1, t2;
diff --git a/mysql-test/main/null_aware_cardinality.test b/mysql-test/main/null_aware_cardinality.test
@@ -1,7 +1,5 @@
 --source include/have_sequence.inc
 
-SET @session_start_value = @@new_mode;
-
 --echo # Small driving table
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1, 1), (2, 2000),(3,300);
@@ -15,8 +13,6 @@ INSERT INTO t2 SELECT seq/100,  NULL FROM seq_1_to_1000;
 
 ANALYZE TABLE t2 PERSISTENT FOR ALL;
 
-SET @@new_mode = "FIX_INDEX_STATS_FOR_ALL_NULLS";
-
 --echo # NULL-rejecting equality t1.b = t2.b will not return any matches
 --echo # because all values of t2.b are NULL. So "rows" = 1 for t2 where 1 is
 --echo # a special value meaning "very few" rows
@@ -52,16 +48,11 @@ EXPLAIN EXTENDED SELECT * FROM t1 JOIN t3 ON t1.a = t3.a AND t1.b <=> t3.b;
 
 EXPLAIN EXTENDED SELECT * FROM t1 JOIN t3 ON t1.a = t3.a AND t3.b is NULL;
 
---echo # In the old mode (null-aware estimation is not enabled), "rows" > 1
-SET @@new_mode = "";
-EXPLAIN EXTENDED SELECT * FROM t1 JOIN t2 ON t1.a = t2.a AND t1.b = t2.b;
-
 --echo # Insert some non-NULL values and re-collect the stats
 INSERT INTO t3 SELECT 1, 1 FROM seq_1_to_100;
 
 ANALYZE TABLE t3 PERSISTENT FOR COLUMNS (b) INDEXES (key_ab);
 
-SET @@new_mode = "FIX_INDEX_STATS_FOR_ALL_NULLS";
 EXPLAIN EXTENDED SELECT * FROM t1 JOIN t3 ON t1.a = t3.a AND t1.b = t3.b;
 
 --echo # Test composite index for 3 columns. Key prefix is used for access
@@ -99,5 +90,4 @@ ANALYZE TABLE t2 PERSISTENT FOR COLUMNS (b) INDEXES (i1);
 
 EXPLAIN SELECT * FROM t1, t2 WHERE t2.a=t1.a AND t2.b=t1.a;
 
-SET @@new_mode = @session_start_value;
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/vcol/r/order_by_group_by_subst.result b/mysql-test/suite/vcol/r/order_by_group_by_subst.result
@@ -222,3 +222,19 @@ a	b
 5	4
 5	5
 drop table t1, t2;
+#
+# MDEV-37422: SIGSEGV failed in base_list_iterator::replace, Assertion `n < m_size'
+#   in Baounds_checked_array, ASAN use-after-poison in JOIN::rollup_make_fields
+#
+CREATE TABLE t1 (
+a INT,
+b INT,
+a1 INT GENERATED ALWAYS AS (a) VIRTUAL,
+INDEX (a1)
+) ENGINE=INNODB;
+SELECT * FROM t1 GROUP BY a WITH ROLLUP;
+a	b	a1
+drop table t1;
+#
+# End of 12.1 tests
+#
diff --git a/mysql-test/suite/vcol/t/order_by_group_by_subst.test b/mysql-test/suite/vcol/t/order_by_group_by_subst.test
@@ -168,3 +168,22 @@ insert into t1 (a) select seq from seq_1_to_5;
 insert into t2 (b) select seq from seq_1_to_5;
 SELECT a, b FROM t1, t2 GROUP BY a, b HAVING a>2 and b>2;
 drop table t1, t2;
+
+--echo #
+--echo # MDEV-37422: SIGSEGV failed in base_list_iterator::replace, Assertion `n < m_size'
+--echo #   in Baounds_checked_array, ASAN use-after-poison in JOIN::rollup_make_fields
+--echo #
+--source include/have_innodb.inc
+CREATE TABLE t1 (
+  a INT,
+  b INT,
+  a1 INT GENERATED ALWAYS AS (a) VIRTUAL,
+  INDEX (a1)
+) ENGINE=INNODB;
+
+SELECT * FROM t1 GROUP BY a WITH ROLLUP;
+drop table t1;
+
+--echo #
+--echo # End of 12.1 tests
+--echo #
diff --git a/sql/item_numconvfunc.cc b/sql/item_numconvfunc.cc
@@ -2444,7 +2444,7 @@ class Parser: public Tokenizer,
      :A(Unsigned_currency::Container(
           Approximate::Container(
             Decimal(
-              std::move(Zeros_or_nines(static_cast<Zeros&&>(rhs))),
+              Zeros_or_nines(static_cast<Zeros&&>(rhs)),
               std::move(static_cast<Decimal_tail&&>(rhs))),
             std::move(static_cast<EEEE&&>(rhs))))),
       B(std::move(static_cast<Postfix_sign&&>(rhs)))
diff --git a/sql/opt_hints.cc b/sql/opt_hints.cc
@@ -1525,8 +1525,8 @@ bool Opt_hints_qb::compare_table_name(
     considered to be equal to `Opt_hints_qb::get_name()`
   */
   const LEX_CSTRING &hint_tab_qb_name=
-      hint_table_and_qb->qb_name.length > 0 ? hint_table_and_qb->qb_name :
-                                              this->get_name();
+      hint_table_and_qb->qb_name.length > 0 || this->get_name().length == 0
+        ? hint_table_and_qb->qb_name : this->get_name();
 
   CHARSET_INFO *cs= charset_info();
   // Compare QB names
diff --git a/sql/opt_vcol_substitution.cc b/sql/opt_vcol_substitution.cc
@@ -303,7 +303,11 @@ bool substitute_indexed_vcols_for_join(JOIN *join)
   ctx.subst_count= 0;
   if (join->order)
     subst_vcols_in_order(&ctx, join->order, join, false);
-  if (join->group_list)
+  /*
+    Do not do substitution for WITH ROLLUP as that breaks some of its data
+    structures.
+  */
+  if (join->group_list && join->rollup.state == st_rollup::STATE_NONE)
     subst_vcols_in_order(&ctx, join->group_list, join, true);
   if (ctx.subst_count)
   {
diff --git a/sql/sql_class.h b/sql/sql_class.h
@@ -232,10 +232,6 @@ void old_mode_deprecated_warnings(ulonglong v);
 /* Definitions above that have transitioned from new behaviour to default */
 
 #define NOW_DEFAULT                                             -1
-#define NEW_MODE_TEST_WARNING1                               NOW_DEFAULT
-#define NEW_MODE_TEST_WARNING2                               NOW_DEFAULT
-#define NEW_MODE_FIX_DISK_TMPTABLE_COSTS                     NOW_DEFAULT
-#define NEW_MODE_FIX_INDEX_STATS_FOR_ALL_NULLS               NOW_DEFAULT
 
 #define TEST_NEW_MODE_FLAG(thd, flag) \
   (flag == NOW_DEFAULT ? TRUE : thd->variables.new_behavior & flag)
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
@@ -312,18 +312,20 @@ template <bool replace>
 int TABLE::delete_row(bool treat_versioned)
 {
   int err= 0;
+  bool remembered_pos= false;
   uchar *del_buf= record[replace ? 1 : 0];
   bool delete_row= !treat_versioned
                    || in_use->lex->vers_conditions.delete_history
                    || versioned(VERS_TRX_ID)
                    || !vers_end_field()->is_max(
                            vers_end_field()->ptr_in_record(del_buf));
 
-  if ((err= file->extra(HA_EXTRA_REMEMBER_POS)))
-    return err;
-
   if (!delete_row)
   {
+    if ((err= file->extra(HA_EXTRA_REMEMBER_POS)))
+      return err;
+    remembered_pos= true;
+
     if (replace)
     {
       store_record(this, record[2]);
@@ -370,7 +372,8 @@ int TABLE::delete_row(bool treat_versioned)
   if (delete_row)
     err= file->ha_delete_row(del_buf);
 
-  (void) file->extra(HA_EXTRA_RESTORE_POS);
+  if (remembered_pos)
+    (void) file->extra(HA_EXTRA_RESTORE_POS);
 
   return err;
 }
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -15228,7 +15228,7 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
     do
     {
       keyuse->key= table->s->keys;
-      keyuse->keypart_map= (key_part_map) (1 << parts);     
+      keyuse->keypart_map= (key_part_map)1 << parts;
       keyuse++;
       i++;
     } 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
@@ -7445,10 +7445,9 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables, TABLE *table,
               statistics.
             */
             KEY *keyinfo= show_table->key_info + i;
-            if (keyinfo->rec_per_key[j])
+            if (double arpk= keyinfo->actual_rec_per_key(j))
             {
-              ha_rows records= (ha_rows) ((double) show_table->stat_records() /
-                                          keyinfo->actual_rec_per_key(j));
+              ha_rows records= (ha_rows) ((double) show_table->stat_records() / arpk);
               table->field[9]->store((longlong) records, TRUE);
               table->field[9]->set_notnull();
             }
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc
@@ -4164,11 +4164,10 @@ void set_statistics_for_table(THD *thd, TABLE *table)
         (check_eits_preferred(thd) &&
          table->stats_is_read &&
          key_info->read_stats->avg_frequency_is_inited() &&
-         key_info->read_stats->has_stats(thd));
+         key_info->read_stats->has_stats());
 
     // Fill out `all_nulls_key_parts` bitmap
-    if (TEST_NEW_MODE_FLAG(thd, NEW_MODE_FIX_INDEX_STATS_FOR_ALL_NULLS) &&
-        key_info->is_statistics_from_stat_tables)
+    if (key_info->is_statistics_from_stat_tables)
     {
       for (uint part_idx= 0; part_idx < key_info->usable_key_parts; part_idx++)
       {
diff --git a/sql/sql_statistics.h b/sql/sql_statistics.h
@@ -614,13 +614,7 @@ class Index_statistics
 
   void mark_stats_as_read() { stats_were_read= true; }
 
-  bool has_stats(THD *thd) const
-  {
-    if (TEST_NEW_MODE_FLAG(thd, NEW_MODE_FIX_INDEX_STATS_FOR_ALL_NULLS))
-      return stats_were_read;
-    else
-      return get_avg_frequency(0) > 0.5;
-  }
+  bool has_stats() const { return stats_were_read; }
 
   bool avg_frequency_is_inited() { return avg_frequency != NULL; }
 
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -4174,9 +4174,9 @@ static Sys_var_set Sys_old_behavior(
 */
 static const char *new_mode_all_names[]=
 {
-  "FIX_DISK_TMPTABLE_COSTS",
+  "FIX_DISK_TMPTABLE_COSTS",        // Default from here, See NEW_MODE_MAX
   "FIX_INDEX_STATS_FOR_ALL_NULLS",
-  "TEST_WARNING1",                       // Default from here, See NEW_MODE_MAX
+  "TEST_WARNING1",
   "TEST_WARNING2",
   0
 };
diff --git a/strings/json_normalize.c b/strings/json_normalize.c
