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

undo one row warning instead use sql_warnings=1

Browse Source 
sql/sql_insert.cc:
  Undo warnings for single row inserts
mysql-test/t/warnings.test:
  undo one row warning instead use sql_warnings=1
mysql-test/r/warnings.result:
  Fix result file
This commit is contained in:
unknown
2003-07-21 19:37:18 +03:00
parent f22517e4ec
commit d1db620853
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_insert.cc
View File

@@ -231,9 +231,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
info.update_fields=&update_fields;
info.update_values=&update_values;
// Don't count warnings for simple inserts
if ((thd->client_capabilities & CLIENT_PROTOCOL_41) ||
values_list.elements > 1 ||
(thd->options & OPTION_WARNINGS))
if (values_list.elements > 1 || (thd->options & OPTION_WARNINGS))
thd->count_cuted_fields = 1;
thd->cuted_fields = 0L;
table->next_number_field=table->found_next_number_field;