diff options
| author | unknown <venu@hundin.mysql.fi> | 2003-07-21 19:37:18 +0300 |
|---|---|---|
| committer | unknown <venu@hundin.mysql.fi> | 2003-07-21 19:37:18 +0300 |
| commit | d1db6208537a93a90a26d07a4a5ae65bda969e51 (patch) | |
| tree | 10619d7ae675b27c2d4e8ff5d2605c124694ab51 /sql/sql_insert.cc | |
| parent | f22517e4eca9b00049bb9cf9176c9d3489dfe94e (diff) | |
| download | mariadb-git-d1db6208537a93a90a26d07a4a5ae65bda969e51.tar.gz | |
undo one row warning instead use sql_warnings=1
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
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e2a7c517688..947205949f1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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; |