summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorvenu@hundin.mysql.fi <>2003-07-21 19:37:18 +0300
committervenu@hundin.mysql.fi <>2003-07-21 19:37:18 +0300
commit0440e70a96a774a1c484c49939e1b7ef1ab87df5 (patch)
tree10619d7ae675b27c2d4e8ff5d2605c124694ab51 /sql/sql_insert.cc
parentbc7cf3033885e91812688a9c9248d8a7acdea211 (diff)
downloadmariadb-git-0440e70a96a774a1c484c49939e1b7ef1ab87df5.tar.gz
undo one row warning instead use sql_warnings=1
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc4
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;