Commit a0ddfab9 authored by Sergey Glukhov's avatar Sergey Glukhov
Browse files

5.0-bugteam->5.1-bugteam merge

parents 669a8e82 17cd69cc

mysql-test/r/perror-win.result

+4 −3
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ MySQL error code 150: Foreign key constraint is incorrectly formed 
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.

OS error code  23:  Too many open files in system

Win32 error code 23: Data error (cyclic redundancy check).

Win32 error code 15000: The specified channel path is invalid.
 
Win32 error code 500: User profile cannot be loaded.

Illegal error code: 30000

mysql-test/t/perror-win.test

+6 −3
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ eval select LENGTH("$MY_PERROR") > 0 as "have_perror"; 
enable_query_log;





--exec $MY_PERROR 150

--exec $MY_PERROR 23

--exec $MY_PERROR 15000
 
--exec $MY_PERROR 150 2>&1

--exec $MY_PERROR 23 2>&1

--exec $MY_PERROR 500 2>&1

--error 1

--exec $MY_PERROR 30000 2>&1

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,7 @@ void Item_func_min_max::fix_length_and_dec() 


uint Item_func_min_max::cmp_datetimes(ulonglong *value)

{

  ulonglong min_max;

  longlong min_max;

  uint min_max_idx= 0;

  LINT_INIT(min_max);

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void print_slave_skip_errors(void) 
    10 characters must be sufficient for a number plus {',' | '...'}

    plus a NUL terminator. That is a max 6 digit number.

  */

  const int MIN_ROOM= 10;

  const uint MIN_ROOM= 10;

  DBUG_ENTER("print_slave_skip_errors");

  DBUG_ASSERT(sizeof(slave_skip_error_names) > MIN_ROOM);

  DBUG_ASSERT(MAX_SLAVE_ERROR <= 999999); // 6 digits