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_lex.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_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 16925348cce..efbf29cf207 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -126,7 +126,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->param_list.empty(); lex->view_list.empty(); lex->prepared_stmt_params.empty(); - lex->auxilliary_table_list.empty(); + lex->auxiliary_table_list.empty(); lex->unit.next= lex->unit.master= lex->unit.link_next= lex->unit.return_to= 0; lex->unit.prev= lex->unit.link_prev= 0; |