From a4bc332dd59fc971f4048449c982155401957d33 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Jul 2003 19:37:18 +0300 Subject: 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 --- sql/sql_insert.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sql/sql_insert.cc') 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; -- cgit v1.2.1