database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-11 13:21:44 +03:00
Code

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
This commit is contained in:
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se 2006-01-19 07:41:58 -05:00
commit 5a63dacdfa
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/partition_1.inc
View File

@ -745,3 +745,4 @@ if ($fixed_bug16370)
--source include/partition_12.inc --source include/partition_12.inc
} }
DROP TABLE t1; DROP TABLE t1;
DROP TABLE if exists t0_template;

1
sql/sql_lex.cc
View File

@ -179,6 +179,7 @@ void lex_start(THD *thd, const uchar *buf, uint length)
lex->query_tables_own_last= 0; lex->query_tables_own_last= 0;
lex->escape_used= lex->et_compile_phase= FALSE; lex->escape_used= lex->et_compile_phase= FALSE;
lex->name= 0;
lex->et= NULL; lex->et= NULL;
if (lex->sroutines.records) if (lex->sroutines.records)

10
sql/sql_partition.cc
View File

@ -3867,7 +3867,9 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
DBUG_PRINT("info", ("Successful parse")); DBUG_PRINT("info", ("Successful parse"));
part_info= lex.part_info; 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 (is_create_table_ind)
{ {
if (old_lex->name) 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 old_lex->name contains the t2 and the table we are opening has
name t1. 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)) if (partition_default_handling(table, part_info))
{ {
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
@ -3892,7 +3890,9 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
table->part_info= part_info; table->part_info= part_info;
table->file->set_part_info(part_info); table->file->set_part_info(part_info);
if (part_info->default_engine_type == NULL) if (part_info->default_engine_type == NULL)
{
part_info->default_engine_type= default_db_type; part_info->default_engine_type= default_db_type;
}
else else
{ {
DBUG_ASSERT(part_info->default_engine_type == default_db_type); DBUG_ASSERT(part_info->default_engine_type == default_db_type);