From 78119b2d04457abe94f2a0a9f3d887c0eb9210a5 Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Fri, 28 Nov 2008 14:50:13 +0400
Subject: [PATCH] pushbuild failure fixes

mysql-test/r/perror-win.result:
  pushbuild failure fix
mysql-test/t/perror-win.test:
  pushbuild failure fix
sql/item_func.cc:
  pushbuild failure fix
---
 mysql-test/r/perror-win.result | 7 ++++---
 mysql-test/t/perror-win.test   | 9 ++++++---
 sql/item_func.cc               | 2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/mysql-test/r/perror-win.result b/mysql-test/r/perror-win.result
index 61e6fcaab4e..8d3026bc331 100644
--- a/mysql-test/r/perror-win.result
+++ b/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
diff --git a/mysql-test/t/perror-win.test b/mysql-test/t/perror-win.test
index 56615e72a5a..2b38c5fad54 100644
--- a/mysql-test/t/perror-win.test
+++ b/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
+
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 8295bd41334..c0d08d9b213 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2275,7 +2275,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);