1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on updating a performance_schema table

Browse Source 
This was failing not only for P_S, but for any engine that had
HA_PRIMARY_KEY_REQUIRED_FOR_DELETE flag set (in the tree - only P_S and federated).
Because of this flag, read_set and write_set were (possibly) changed
on update. But later the code modified these bitmaps and restored them to the default
state, losing HA_PRIMARY_KEY_REQUIRED_FOR_DELETE related changes.

sql/handler.cc:
  small optimization.
  don't change the *write* set only because all columns has to be *read*
This commit is contained in:
Sergei Golubchik 2012-12-15 21:54:18 +01:00
parent 2217717ff6
commit 47f5632d60
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/perfschema/r/update_order-3837.result Normal file
View File

@ -0,0 +1 @@
UPDATE performance_schema.setup_instruments SET timed = 'YES' ORDER BY name;

8
mysql-test/suite/perfschema/t/update_order-3837.test Normal file
View File

@ -0,0 +1,8 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
#
# MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on updating a performance_schema table
#
UPDATE performance_schema.setup_instruments SET timed = 'YES' ORDER BY name;

2
sql/handler.cc
View File

@ -5446,7 +5446,7 @@ int handler::ha_delete_row(const uchar *buf)
void handler::use_hidden_primary_key()
{
/* fallback to use all columns in the table to identify row */
table->use_all_columns();
table->column_bitmaps_set(&table->s->all_set, table->write_set);
}

13
sql/sql_update.cc
View File

@ -480,10 +480,8 @@ int mysql_update(THD *thd,
We can't update table directly; We must first search after all
matching rows before updating the table!
*/
// Verify that table->restore_column_maps_after_mark_index() will work
DBUG_ASSERT(table->read_set == &table->def_read_set);
DBUG_ASSERT(table->write_set == &table->def_write_set);
MY_BITMAP *save_read_set= table->read_set;
MY_BITMAP *save_write_set= table->write_set;
if (used_index < MAX_KEY && old_covering_keys.is_set(used_index))
table->add_read_columns_used_by_index(used_index);
@ -622,11 +620,8 @@ int mysql_update(THD *thd,
if (error >= 0)
goto err;
}
/*
This restore bitmaps, works for add_read_columns_used_by_index() and
use_all_columns():
*/
table->restore_column_maps_after_mark_index();
table->disable_keyread();
table->column_bitmaps_set(save_read_set, save_write_set);
}
if (ignore)