merge

mysql-test/r/perror-win.result

@@ -1,5 +1,6 @@
 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.
+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 23: Data error (cyclic redundancy check).
+Win32 error code 500: User profile cannot be loaded.
+Illegal error code: 30000

mysql-test/t/perror-win.test

@@ -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

@@ -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);