From e20232cf633a8232a3de2c56e8eb53b2c446f55a Mon Sep 17 00:00:00 2001
From: "malff/marcsql@weblab.(none)" <>
Date: Fri, 15 Jun 2007 10:59:40 -0600
Subject: [PATCH 1/2] manual merge

---
 tests/mysql_client_test.c | 54 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 0985b4d25ec..9bf062f7df8 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15680,6 +15680,59 @@ static void test_bug28934()
 }
 
 
+/*
+  Bug#27592 (stack overrun when storing datetime value using prepared statements)
+*/
+
+static void test_bug27592()
+{
+  const int NUM_ITERATIONS= 40;
+  int i;
+  int rc;
+  MYSQL_STMT *stmt= NULL;
+  MYSQL_BIND bind[1];
+  MYSQL_TIME time_val;
+
+  DBUG_ENTER("test_bug27592");
+  myheader("test_bug27592");
+
+  mysql_query(mysql, "DROP TABLE IF EXISTS t1");
+  mysql_query(mysql, "CREATE TABLE t1(c2 DATETIME)");
+
+  stmt= mysql_simple_prepare(mysql, "INSERT INTO t1 VALUES (?)");
+  DIE_UNLESS(stmt);
+
+  memset(bind, 0, sizeof(bind));
+
+  bind[0].buffer_type= MYSQL_TYPE_DATETIME;
+  bind[0].buffer= (char *) &time_val;
+  bind[0].length= NULL;
+
+  for (i= 0; i < NUM_ITERATIONS; i++)
+  {
+    time_val.year= 2007;
+    time_val.month= 6;
+    time_val.day= 7;
+    time_val.hour= 18;
+    time_val.minute= 41;
+    time_val.second= 3;
+
+    time_val.second_part=0;
+    time_val.neg=0;
+
+    rc= mysql_stmt_bind_param(stmt, bind);
+    check_execute(stmt, rc);
+
+    rc= mysql_stmt_execute(stmt);
+    check_execute(stmt, rc);
+  }
+
+  mysql_stmt_close(stmt);
+
+  DBUG_VOID_RETURN;
+}
+
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -15963,6 +16016,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug27876", test_bug27876 },
   { "test_bug28505", test_bug28505 },
   { "test_bug28934", test_bug28934 },
+  { "test_bug27592", test_bug27592 },
   { 0, 0 }
 };
 

From 4b427bde8226427066c7f2213a53815f3ba0d39c Mon Sep 17 00:00:00 2001
From: "malff/marcsql@weblab.(none)" <>
Date: Fri, 15 Jun 2007 11:15:22 -0600
Subject: [PATCH 2/2] Fixed warnings raised from mysqltest (unknown --
 commands)

---
 mysql-test/t/greedy_optimizer.test  | 4 ++--
 mysql-test/t/join.test              | 6 ++++--
 mysql-test/t/ndb_index_ordered.test | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/t/greedy_optimizer.test
index 049d0ab09f7..b73f70c6a3e 100644
--- a/mysql-test/t/greedy_optimizer.test
+++ b/mysql-test/t/greedy_optimizer.test
@@ -145,11 +145,11 @@ select @@optimizer_prune_level;
 #
 # These are the values for the parameters that control the greedy optimizer
 # (total 6 combinations - 3 for optimizer_search_depth, 2 for optimizer_prune_level):
---
+# 3:
 # set optimizer_search_depth=0;  - automatic
 # set optimizer_search_depth=1;  - min
 # set optimizer_search_depth=62; - max (default)
---
+# 2:
 # set optimizer_prune_level=0 - exhaustive;
 # set optimizer_prune_level=1 - heuristic; # default
 
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 68b97854c3b..5b599c3dad7 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -512,10 +512,12 @@ select * from v1a join (t3 natural join t4) on a = y;
 #--------------------------------------------------------------------
 # Negative tests (tests for errors)
 #--------------------------------------------------------------------
+# works in Oracle - bug
 -- error 1052
-select * from t1 natural join (t3 cross join t4); -- works in Oracle - bug
+select * from t1 natural join (t3 cross join t4);
+# works in Oracle - bug
 -- error 1052
-select * from (t3 cross join t4) natural join t1; -- works in Oracle - bug
+select * from (t3 cross join t4) natural join t1;
 -- error 1052
 select * from t1 join (t2, t3) using (b);
 -- error 1052
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index 19b024a043f..31385fd56b2 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -50,7 +50,7 @@ update t1 set c = 13 where b <= 3;
 select * from t1 order by a;
 update t1 set b = b + 1 where b > 4 and b < 7;
 select * from t1 order by a;
--- Update primary key
+# Update primary key
 update t1 set a = a + 10 where b > 1 and b < 7;
 select * from t1 order by a;