diff options
author | unknown <konstantin@bodhi.netgear> | 2006-07-06 23:59:04 +0400 |
---|---|---|
committer | unknown <konstantin@bodhi.netgear> | 2006-07-06 23:59:04 +0400 |
commit | 8995277acc05f9998e9f7a24aa8cb9e1d917945e (patch) | |
tree | 3688ab01357b1d5fa6a6f036bd6ed40206160dc4 /sql/table.h | |
parent | d94521c32d9a40820e5e5f1e6175b8ee39d758b2 (diff) | |
download | mariadb-git-8995277acc05f9998e9f7a24aa8cb9e1d917945e.tar.gz |
A fix and a test case for Bug#19399 "res 'Lost Connection' when
dropping/creating tables".
The bug could lead to a crash when multi-delete statements were
prepared and used with temporary tables.
The bug was caused by lack of clean-up of multi-delete tables before
re-execution of a prepared statement. In a statement like
DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
moved to lex->auxilliary_table_list and excluded from lex->query_tables
or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
and not cleaned up before re-execution of a prepared statement.
mysql-test/r/ps.result:
Updated test results (Bug#19399)
mysql-test/t/ps.test:
A test case for Bug#19399 "Stored Procedures 'Lost Connection' when
dropping/creating tables": test that multi-delete
tables are cleaned up properly before re-execution.
sql/sql_lex.cc:
Always initialize auxilliary_table_list when we initialize the lex:
this way we don't have to check that lex->sql_command equals to
SQLCOM_DELETE_MULTI whenever we need to access auxilliary_table_list.
In particular, in reinit_stmt_before_use we can simply check that
auxilliary_table_list is not NULL and clean it up if the check returns
a true value.
sql/sql_prepare.cc:
Move the one table clean-up functionality to a method of st_table_list.
Clean up auxiliary_table_list if it's not empty.
sql/table.cc:
Implement st_table_list::reinit_before_use().
sql/table.h:
Declare st_table_list::reinit_before_use().
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 8cb15d3a69c..d615623cc37 100644 --- a/sql/table.h +++ b/sql/table.h @@ -238,6 +238,11 @@ typedef struct st_table_list bool cacheable_table; /* stop PS caching */ /* used in multi-upd privelege check */ bool table_in_update_from_clause; + /* + Cleanup for re-execution in a prepared statement or a stored + procedure. + */ + void reinit_before_use(THD *thd); } TABLE_LIST; typedef struct st_changed_table_list |