bk commit into 5.0 tree (msvensson:1.1847)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1847 05/03/23 13:25:31 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/mysqld.cc
    1.441 05/03/23 13:25:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/warnings.test
    1.20 05/03/23 13:25:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/warnings.result
    1.31 05/03/23 13:25:29 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.440/sql/mysqld.cc	2005-03-21 22:41:21 +01:00
+++ 1.441/sql/mysqld.cc	2005-03-23 13:25:30 +01:00
@@ -5225,7 +5225,7 @@
    "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,

--- 1.19/mysql-test/t/warnings.test	2005-02-23 18:22:44 +01:00
+++ 1.20/mysql-test/t/warnings.test	2005-03-23 13:25:29 +01:00
@@ -96,6 +96,19 @@
 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
 #

--- 1.30/mysql-test/r/warnings.result	2005-02-23 18:22:44 +01:00
+++ 1.31/mysql-test/r/warnings.result	2005-03-23 13:25:29 +01:00
@@ -142,6 +142,25 @@
 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: