mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 06:35:33 +02:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1 sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_update.cc: Auto merged
This commit is contained in:
commit
584ddfdab2
18 changed files with 347 additions and 253 deletions
|
|
@ -79,7 +79,6 @@ int mysql_update(THD *thd,
|
|||
if ((open_and_lock_tables(thd, table_list)))
|
||||
DBUG_RETURN(-1);
|
||||
thd->proc_info="init";
|
||||
fix_tables_pointers(thd->lex->all_selects_list);
|
||||
table= table_list->table;
|
||||
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
|
||||
|
||||
|
|
@ -431,7 +430,6 @@ int mysql_multi_update(THD *thd,
|
|||
#endif
|
||||
if ((res=open_and_lock_tables(thd,table_list)))
|
||||
DBUG_RETURN(res);
|
||||
fix_tables_pointers(thd->lex->all_selects_list);
|
||||
|
||||
select_lex->select_limit= HA_POS_ERROR;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue