diff options
| author | dlenev@mysql.com <> | 2005-06-09 01:13:20 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2005-06-09 01:13:20 +0400 |
| commit | fae0b7f7afa5d262843974a0a8b20d0cfb6ca8c9 (patch) | |
| tree | ef01275347549f188e825ba1d1ae7938dd79f9e6 /sql/sql_prepare.cc | |
| parent | 8feae4d48f6c49d60bcc0225d5e4067cb3e6f57c (diff) | |
| parent | 5394a1a4bddc7fad8d8d490c5d1a902152916a2f (diff) | |
| download | mariadb-git-fae0b7f7afa5d262843974a0a8b20d0cfb6ca8c9.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index cb96f57a58a..f1b3c69264c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1402,8 +1402,6 @@ static bool mysql_test_multiupdate(Prepared_statement *stmt, static bool mysql_test_multidelete(Prepared_statement *stmt, TABLE_LIST *tables) { - uint fake_counter; - stmt->thd->lex->current_select= &stmt->thd->lex->select_lex; if (add_item_to_list(stmt->thd, new Item_null())) { @@ -1411,7 +1409,7 @@ static bool mysql_test_multidelete(Prepared_statement *stmt, goto error; } - if (multi_delete_precheck(stmt->thd, tables, &fake_counter) || + if (multi_delete_precheck(stmt->thd, tables) || select_like_stmt_test_with_open_n_lock(stmt, tables, &mysql_multi_delete_prepare, OPTION_SETUP_TABLES_DONE)) |