database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge

Browse Source 
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown
2004-10-04 13:56:48 +03:00
parent 99bf885bf5 50cc3e4ab0
commit faea84119b
35 changed files with 429 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@@ -2818,7 +2818,8 @@ unsent_create_error:
if ((res= mysql_insert_select_prepare(thd)))
break;
if ((result= new select_insert(first_table, first_table->table,
&lex->field_list, lex->duplicates)))
&lex->field_list, lex->duplicates,
lex->duplicates == DUP_IGNORE)))
{
/* Skip first table, which is the table we are inserting in */
lex->select_lex.table_list.first= (byte*) first_table->next_local;