diff options
| -rw-r--r-- | mysql-test/r/warnings.result | 19 | ||||
| -rw-r--r-- | mysql-test/t/warnings.test | 13 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index e03d72351d1..d1d96afa153 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -142,6 +142,25 @@ Warning 1265 Data truncated for column 'b' at row 10 select @@warning_count; @@warning_count 50 +set max_error_count=0; +show variables like 'max_error_count'; +Variable_name Value +max_error_count 0 +update t1 set b='hi'; +Warnings: +select @@warning_count; +@@warning_count +50 +show warnings; +Level Code Message +set max_error_count=65535; +show variables like 'max_error_count'; +Variable_name Value +max_error_count 65535 +set max_error_count=10; +show variables like 'max_error_count'; +Variable_name Value +max_error_count 10 drop table t1; create table t1 (id int) engine=isam; Warnings: diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index 23ab5aa1f05..2a90f5f637d 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -97,6 +97,19 @@ update t1 set b=a; select @@warning_count; --enable_ps_protocol +# Bug#9072 +set max_error_count=0; +show variables like 'max_error_count'; +update t1 set b='hi'; +--disable_ps_protocol +select @@warning_count; +--enable_ps_protocol +show warnings; +set max_error_count=65535; +show variables like 'max_error_count'; +set max_error_count=10; +show variables like 'max_error_count'; + # # Test for handler type # diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 43ccfe2b366..59ab1a5610d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5053,7 +5053,7 @@ The minimum value for this variable is 4096.", "Max number of errors/warnings to store for a statement.", (gptr*) &global_system_variables.max_error_count, (gptr*) &max_system_variables.max_error_count, - 0, GET_ULONG, REQUIRED_ARG, DEFAULT_ERROR_COUNT, 1, 65535, 0, 1, 0}, + 0, GET_ULONG, REQUIRED_ARG, DEFAULT_ERROR_COUNT, 0, 65535, 0, 1, 0}, {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE, "Don't allow creation of heap tables bigger than this.", (gptr*) &global_system_variables.max_heap_table_size, |