diff options
| author | unknown <venu@myvenu.com> | 2003-07-21 00:13:22 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-07-21 00:13:22 -0700 |
| commit | f22517e4eca9b00049bb9cf9176c9d3489dfe94e (patch) | |
| tree | 9921fe8a50425c0c8d0110c2619d4d89664409e3 /sql/sql_insert.cc | |
| parent | 012910656f4ee03d944220f50f7a530dfc9aeda1 (diff) | |
| download | mariadb-git-f22517e4eca9b00049bb9cf9176c9d3489dfe94e.tar.gz | |
Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
tests/client_test.c:
test for timestamp bug (BR #819)
sql/sql_insert.cc:
Enable warnings by default for single value list
protocol
mysql-test/t/warnings.test:
Updated test for single value list insert warning
mysql-test/r/warnings.result:
Updated warnings results
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 947205949f1..e2a7c517688 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -231,7 +231,9 @@ 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 (values_list.elements > 1 || (thd->options & OPTION_WARNINGS)) + if ((thd->client_capabilities & CLIENT_PROTOCOL_41) || + 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; |