mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
fixed printing of COLLATE operation (BUG#5155) mysql-test/r/case.result: fixed printing of COLLATE operation mysql-test/r/func_if.result: fixed printing of COLLATE operation mysql-test/r/func_in.result: fixed printing of COLLATE operation mysql-test/r/func_str.result: fixed printing of COLLATE operation mysql-test/r/func_test.result: fixed printing of COLLATE operation mysql-test/r/view.result: VIEW with collation mysql-test/t/view.test: VIEW with collation sql/item_strfunc.cc: fixed printing of COLLATE operation sql/item_strfunc.h: fixed printing of COLLATE operation sql/sp_head.cc: fixed open_and_lock_tables result processing sql/sql_base.cc: fixed open_and_lock_tables result processing sql/sql_delete.cc: fixed open_and_lock_tables result processing sql/sql_help.cc: fixed open_and_lock_tables result processing sql/sql_load.cc: fixed open_and_lock_tables result processing sql/sql_parse.cc: fixed open_and_lock_tables result processing sql/sql_prepare.cc: fixed open_and_lock_tables result processing sql/sql_show.cc: fixed open_and_lock_tables result processing sql/sql_update.cc: fixed open_and_lock_tables result processing
This commit is contained in:
@@ -39,8 +39,8 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order,
|
||||
ha_rows deleted;
|
||||
DBUG_ENTER("mysql_delete");
|
||||
|
||||
if ((open_and_lock_tables(thd, table_list)))
|
||||
DBUG_RETURN(-1);
|
||||
if ((error= open_and_lock_tables(thd, table_list)))
|
||||
DBUG_RETURN(error);
|
||||
table= table_list->table;
|
||||
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
|
||||
thd->proc_info="init";
|
||||
|
Reference in New Issue
Block a user