diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-29 18:01:33 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-29 18:01:33 +0400 |
| commit | 52f361ecb863eab4fda5e3e5b5da7f4c430e9e65 (patch) | |
| tree | 2eb9807085774f1b10d8e1032449dea5c242e76c /sql/lock.h | |
| parent | 349b34b3638e70eccdbbfa98daebb5c382ab4f29 (diff) | |
| download | mariadb-git-52f361ecb863eab4fda5e3e5b5da7f4c430e9e65.tar.gz | |
A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()".
Remove mysql_lock_have_duplicate(), since now we always
have TABLE_LIST objects for MyISAMMRG children
in lex->query_tables and keep it till the end of the
statement (sub-statement).
mysql-test/r/merge.result:
Update results (Bug#54811).
mysql-test/t/merge-big.test:
Update to new wait state.
mysql-test/t/merge.test:
Add a test case for Bug#54811.
sql/lock.cc:
Remove a function that is now unused.
sql/lock.h:
Remove a function that is now unused.
sql/sql_base.cc:
Don't try to search for duplicate table among THR_LOCK objects, TABLE_LIST list contains all used tables.
Diffstat (limited to 'sql/lock.h')
| -rw-r--r-- | sql/lock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lock.h b/sql/lock.h index 84c7bce0679..4bdf0085d07 100644 --- a/sql/lock.h +++ b/sql/lock.h @@ -60,8 +60,6 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); void mysql_lock_abort(THD *thd, TABLE *table, bool upgrade_lock); bool mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); -TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, - TABLE_LIST *haystack); void broadcast_refresh(void); /* Lock based on name */ bool lock_table_names(THD *thd, TABLE_LIST *table_list); |