database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-26911: Unexpected ER_DUP_KEY, ASAN errors, double free detected in ...

Browse Source 
When loading the histogram, use table->field[N], not table->s->field[N].

When we used the latter we would corrupt the fields's default value. One
of the consequences of that would be that AUTO_INCREMENT fields would
stop working correctly.
This commit is contained in:
Sergei Petrunia
2021-11-02 15:18:50 +03:00
parent ac0194bd0e
commit 106c785e2d
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/main/statistics_json.result
View File

@ -7645,3 +7645,16 @@ a
foo foo
? ?
drop table t1; drop table t1;
#
# MDEV-26911: Unexpected ER_DUP_KEY, ASAN errors, double free detected in tcache with JSON_HB histogram
#
SET histogram_type= JSON_HB;
CREATE TABLE t1 (pk INT AUTO_INCREMENT, f VARCHAR(8), PRIMARY KEY (pk));
INSERT INTO t1 (f) VALUES ('foo');
ANALYZE TABLE t1 PERSISTENT FOR ALL;
Table Op Msg_type Msg_text
test.t1 analyze status Engine-independent statistics collected
test.t1 analyze status OK
ALTER TABLE t1 MODIFY f TEXT, ORDER BY pk;
INSERT INTO t1 (f) VALUES ('bar');
DROP TABLE t1;

15
mysql-test/main/statistics_json.test
View File

@ -5,6 +5,7 @@
let $histogram_type_override='JSON_HB'; let $histogram_type_override='JSON_HB';
--source statistics.test --source statistics.test
--source include/have_innodb.inc
--source include/have_stat_tables.inc --source include/have_stat_tables.inc
--source include/have_sequence.inc --source include/have_sequence.inc
--source include/analyze-format.inc --source include/analyze-format.inc
@ -325,5 +326,17 @@ insert into t1 values ('foo'),(unhex('9C'));
analyze table t1 persistent for all; analyze table t1 persistent for all;
select * from t1; select * from t1;
drop table t1; drop table t1;
--echo #
--echo # MDEV-26911: Unexpected ER_DUP_KEY, ASAN errors, double free detected in tcache with JSON_HB histogram
--echo #
SET histogram_type= JSON_HB;
CREATE TABLE t1 (pk INT AUTO_INCREMENT, f VARCHAR(8), PRIMARY KEY (pk));
INSERT INTO t1 (f) VALUES ('foo');
ANALYZE TABLE t1 PERSISTENT FOR ALL;
ALTER TABLE t1 MODIFY f TEXT, ORDER BY pk;
INSERT INTO t1 (f) VALUES ('bar');
DROP TABLE t1;

13
sql/sql_statistics.cc
View File

@ -1232,7 +1232,8 @@ public:
Histogram_base *hist; Histogram_base *hist;
if (!(hist= create_histogram(mem_root, hist_type, NULL))) if (!(hist= create_histogram(mem_root, hist_type, NULL)))
return NULL; return NULL;
if (!hist->parse(mem_root, table_field, hist_type, Field *field= table->field[table_field->field_index];
if (!hist->parse(mem_root, field, hist_type,
val.ptr(), val.length())) val.ptr(), val.length()))
{ {
table_field->read_stats->histogram= hist; table_field->read_stats->histogram= hist;
@ -3178,6 +3179,14 @@ int read_histograms_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables)
if (stats_cb->start_histograms_load()) if (stats_cb->start_histograms_load())
{ {
Column_stat column_stat(stat_tables[COLUMN_STAT].table, table); Column_stat column_stat(stat_tables[COLUMN_STAT].table, table);
/*
The process of histogram loading makes use of the field it is for. Mark
all fields as readable/writable in order to allow that.
*/
MY_BITMAP *old_sets[2];
dbug_tmp_use_all_columns(table, old_sets, &table->read_set, &table->write_set);
for (Field **field_ptr= table->s->field; *field_ptr; field_ptr++) for (Field **field_ptr= table->s->field; *field_ptr; field_ptr++)
{ {
Field *table_field= *field_ptr; Field *table_field= *field_ptr;
@ -3189,6 +3198,8 @@ int read_histograms_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables)
} }
} }
stats_cb->end_histograms_load(); stats_cb->end_histograms_load();
dbug_tmp_restore_column_maps(&table->read_set, &table->write_set, old_sets);
} }
table->histograms_are_read= true; table->histograms_are_read= true;
DBUG_RETURN(0); DBUG_RETURN(0);