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

merge from 5.2

Browse source
This commit is contained in:
unknown 2012-08-24 14:02:32 +02:00
commit fc666a0df6
44 changed files with 1145 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/sql_insert.cc
View file

@ -3543,16 +3543,16 @@ int select_create::write_to_binlog(bool is_trans, int errcode)
if (thd->lex->create_select_in_comment)
query.append(STRING_WITH_LEN("/*! "));
if (thd->lex->ignore)
query.append(STRING_WITH_LEN("INSERT IGNORE INTO `"));
query.append(STRING_WITH_LEN("INSERT IGNORE INTO "));
else if (thd->lex->duplicates == DUP_REPLACE)
query.append(STRING_WITH_LEN("REPLACE INTO `"));
query.append(STRING_WITH_LEN("REPLACE INTO "));
else
query.append(STRING_WITH_LEN("INSERT INTO `"));
query.append(STRING_WITH_LEN("INSERT INTO "));
query.append(create_table->db, db_len);
query.append(STRING_WITH_LEN("`.`"));
query.append(create_info->alias, table_len);
query.append(STRING_WITH_LEN("` "));
append_identifier(thd, &query, create_table->db, db_len);
query.append(STRING_WITH_LEN("."));
append_identifier(thd, &query, create_info->alias, table_len);
query.append(STRING_WITH_LEN(" "));
/*
The insert items.