From 07e5c13e894ca987c4ea086fe61008aa66750445 Mon Sep 17 00:00:00 2001
From: "pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se" <>
Date: Wed, 18 Jan 2006 16:09:25 -0500
Subject: [PATCH 1/2] Bug fix

---
 mysql-test/include/partition_1.inc |  1 +
 sql/sql_partition.cc               | 10 +++++-----
 sql/sql_yacc.yy                    |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mysql-test/include/partition_1.inc b/mysql-test/include/partition_1.inc
index a6a14fde4c6..e6618af2979 100644
--- a/mysql-test/include/partition_1.inc
+++ b/mysql-test/include/partition_1.inc
@@ -745,3 +745,4 @@ if ($fixed_bug16370)
 --source include/partition_12.inc
 }
 DROP TABLE t1;
+DROP TABLE if exists t0_template;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index d17d088c667..2d1854d9520 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -3867,7 +3867,9 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
 
   DBUG_PRINT("info", ("Successful parse"));
   part_info= lex.part_info;
-  DBUG_PRINT("info", ("default engine = %d", ha_legacy_type(part_info->default_engine_type)));
+  DBUG_PRINT("info", ("default engine = %d, default_db_type = %d",
+             ha_legacy_type(part_info->default_engine_type),
+             ha_legacy_type(default_db_type)));
   if (is_create_table_ind)
   {
     if (old_lex->name)
@@ -3877,10 +3879,6 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
         old_lex->name contains the t2 and the table we are opening has 
         name t1.
       */
-      Table_ident *ti= (Table_ident*)old_lex->name;
-      const char *db_name= ti->db.str ? ti->db.str : thd->db;
-      const char *table_name= ti->table.str;
-      handler *file;
       if (partition_default_handling(table, part_info))
       {
         DBUG_RETURN(TRUE);
@@ -3892,7 +3890,9 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
   table->part_info= part_info;
   table->file->set_part_info(part_info);
   if (part_info->default_engine_type == NULL)
+  {
     part_info->default_engine_type= default_db_type;
+  }
   else
   {
     DBUG_ASSERT(part_info->default_engine_type == default_db_type);
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 69c33a8e7d0..3f0222229dc 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1229,6 +1229,7 @@ create:
 	    lex->key_list.empty();
 	    lex->col_list.empty();
 	    lex->change=NullS;
+	    lex->name=0;
 	  }
 	   '(' key_list ')' opt_fulltext_parser
 	  {

From f7196b8de9d25db0408f9ef1501f640953de0f90 Mon Sep 17 00:00:00 2001
From: "pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se" <>
Date: Wed, 18 Jan 2006 16:18:42 -0500
Subject: [PATCH 2/2] BUG #16596 Moved init to lex_start

---
 sql/sql_lex.cc  | 1 +
 sql/sql_yacc.yy | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 0c4e08abe26..a9050ddf277 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -179,6 +179,7 @@ void lex_start(THD *thd, const uchar *buf, uint length)
   lex->query_tables_own_last= 0;
   lex->escape_used= lex->et_compile_phase= FALSE;
 
+  lex->name= 0;
   lex->et= NULL;
 
   if (lex->sroutines.records)
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3f0222229dc..69c33a8e7d0 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1229,7 +1229,6 @@ create:
 	    lex->key_list.empty();
 	    lex->col_list.empty();
 	    lex->change=NullS;
-	    lex->name=0;
 	  }
 	   '(' key_list ')' opt_fulltext_parser
 	  {