mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 16:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge of mwl #106 into 5.3.

Browse source
This commit is contained in:
Igor Babaev 2011-06-15 21:48:38 -07:00
commit 078b59f5bc
101 changed files with 4492 additions and 1107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_parse.cc
View file

@ -3219,6 +3219,10 @@ end_with_restore_list:
if (!(res= open_and_lock_tables(thd, all_tables)))
{
/*
Only the INSERT table should be merged. Other will be handled by
select.
*/
/* Skip first table, which is the table we are inserting in */
TABLE_LIST *second_table= first_table->next_local;
select_lex->table_list.first= second_table;