From: Date: April 27 2007 10:05pm
Subject: bk commit into 5.0 tree (evgen:1.2444) BUG#27590
List-Archive: http://lists.mysql.com/commits/25633
X-Bug: 27590
Message-Id: <20070427200515.B9A2211C014@sunlight.local>

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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@stripped, 2007-04-28 00:04:50+04:00, evgen@stripped +4 -0
  Additional fix for the bug#27590.

  mysql-test/r/ps_6bdb.result@stripped, 2007-04-28 00:02:33+04:00, evgen@stripped +2 -2
    The result of the adjusted test case after fix for bug#27590.

  mysql-test/r/ps_7ndb.result@stripped, 2007-04-28 00:01:49+04:00, evgen@stripped +2 -2
    The result of the adjusted test case after fix for bug#27590.

  sql/item_cmpfunc.cc@stripped, 2007-04-28 00:02:35+04:00, evgen@stripped +2 -2
    A warning is fixed.

  tests/mysql_client_test.c@stripped, 2007-04-28 00:00:02+04:00, evgen@stripped +4 -4
    Fixed failing build on the windows platform.

# 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:	evgen
# Host:	sunlight.local
# Root:	/local_work/16377-bug-5.0-opt-mysql

--- 1.249/sql/item_cmpfunc.cc	2007-04-28 00:05:14 +04:00
+++ 1.250/sql/item_cmpfunc.cc	2007-04-28 00:05:14 +04:00
@@ -544,7 +544,7 @@
 get_date_from_str(THD *thd, String *str, timestamp_type warn_type,
                   char *warn_name, bool *error_arg)
 {
-  ulonglong value;
+  ulonglong value= 0;
   int error;
   MYSQL_TIME l_time;
   enum_mysql_timestamp_type ret;
@@ -748,7 +748,7 @@
 get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
                    Item *warn_item, bool *is_null)
 {
-  ulonglong value;
+  ulonglong value= 0;
   String buf, *str= 0;
   Item *item= **item_arg;
 

--- 1.47/mysql-test/r/ps_6bdb.result	2007-04-28 00:05:14 +04:00
+++ 1.48/mysql-test/r/ps_6bdb.result	2007-04-28 00:05:14 +04:00
@@ -3053,7 +3053,7 @@
 true
 set @arg00= CAST('1991-01-01 01:01:01' as datetime) ;
 select 'true' as found from t9 
-where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and
+where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
 c14= CAST('1991-01-01 01:01:01' as datetime) and
 c15= CAST('1991-01-01 01:01:01' as datetime) and
 c16= CAST('1991-01-01 01:01:01' as datetime) and
@@ -3066,7 +3066,7 @@
 found
 true
 prepare stmt1 from "select 'true' as found from t9 
-where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and
+where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
   c14= CAST('1991-01-01 01:01:01' as datetime) and
   c15= CAST('1991-01-01 01:01:01' as datetime) and
   c16= CAST('1991-01-01 01:01:01' as datetime) and

--- 1.48/mysql-test/r/ps_7ndb.result	2007-04-28 00:05:14 +04:00
+++ 1.49/mysql-test/r/ps_7ndb.result	2007-04-28 00:05:15 +04:00
@@ -3053,7 +3053,7 @@
 true
 set @arg00= CAST('1991-01-01 01:01:01' as datetime) ;
 select 'true' as found from t9 
-where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and
+where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
 c14= CAST('1991-01-01 01:01:01' as datetime) and
 c15= CAST('1991-01-01 01:01:01' as datetime) and
 c16= CAST('1991-01-01 01:01:01' as datetime) and
@@ -3066,7 +3066,7 @@
 found
 true
 prepare stmt1 from "select 'true' as found from t9 
-where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and
+where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
   c14= CAST('1991-01-01 01:01:01' as datetime) and
   c15= CAST('1991-01-01 01:01:01' as datetime) and
   c16= CAST('1991-01-01 01:01:01' as datetime) and

--- 1.226/tests/mysql_client_test.c	2007-04-28 00:05:15 +04:00
+++ 1.227/tests/mysql_client_test.c	2007-04-28 00:05:15 +04:00
@@ -8785,7 +8785,9 @@
   int        rc, field_count;
   char       name;
   char query[MAX_TEST_QUERY_LENGTH];
-
+  const char *queries [3]= {"SELECT a, b, c FROM test_ts WHERE %c=?",
+                            "SELECT a, b, c FROM test_ts WHERE %c=?",
+                            "SELECT a, b, c FROM test_ts WHERE %c=CAST(? AS DATE)"};
   myheader("test_ts");
 
   rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_ts");
@@ -8852,9 +8854,7 @@
 
   mysql_free_result(prep_res);
   mysql_stmt_close(stmt);
-  char queries [3][60]= {"SELECT a, b, c FROM test_ts WHERE %c=?",
-                         "SELECT a, b, c FROM test_ts WHERE %c=?",
-                         "SELECT a, b, c FROM test_ts WHERE %c=CAST(? AS DATE)"};
+
   for (name= 'a'; field_count--; name++)
   {
     int row_count= 0;