Commit a3762d79 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 226628d1 3315fab9

mysql-test/r/warnings.result

+19 −0
Original line number Diff line number Diff line
@@ -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:

mysql-test/t/warnings.test

+13 −0
Original line number Diff line number Diff line
@@ -96,6 +96,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

#

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5225,7 +5225,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,