diff options
| author | unknown <kostja@bodhi.local> | 2006-07-11 23:39:51 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-11 23:39:51 +0400 |
| commit | 3ff08ab8cbb0963a881a93e317d29cae506f545f (patch) | |
| tree | f76738c20729eb2eb3f3d6ffb995dac19e6802f1 /sql/sql_prepare.cc | |
| parent | d8b447a1b6c4f4f5d2a335eef6b5f4ac4f2f267b (diff) | |
| download | mariadb-git-3ff08ab8cbb0963a881a93e317d29cae506f545f.tar.gz | |
Post-merge fixes for Bug#19399 "Stored Procedures 'Lost Connection'
when dropping/creating tables"
mysql-test/r/ps.result:
A post-merge fix.
mysql-test/t/ps.test:
A post-merge fix: all 5.0 tests should go after 4.1 tests.
sql/sql_lex.cc:
auxilliary -> auxiliary
sql/sql_prepare.cc:
auxilliary -> auxiliary
sql/table.cc:
Update st_table_list::reinit_before_use in 5.0 to include 5.0-specific
cleanups.
sql/table.h:
st_table_list::reinit_before_use is public.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 37a5e2f0af0..a2f73ac9989 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2138,9 +2138,9 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) (multi-delete). We do a full clean up, although at the moment all we need to clean in the tables of MULTI-DELETE list is 'table' member. */ - for (TABLE_LIST *tables= (TABLE_LIST*) lex->auxilliary_table_list.first; + for (TABLE_LIST *tables= (TABLE_LIST*) lex->auxiliary_table_list.first; tables; - tables= tables->next) + tables= tables->next_global) { tables->reinit_before_use(thd); } |