database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code 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
parent a9d73e093a ab411f8f1c
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;