mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Bug fix
mysql-test/include/partition_1.inc: Drop table missing in test case sql/sql_partition.cc: Removed some dead code sql/sql_yacc.yy: initialised name that was missing
This commit is contained in:
@@ -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;
|
||||||
|
@@ -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);
|
||||||
|
@@ -1229,6 +1229,7 @@ create:
|
|||||||
lex->key_list.empty();
|
lex->key_list.empty();
|
||||||
lex->col_list.empty();
|
lex->col_list.empty();
|
||||||
lex->change=NullS;
|
lex->change=NullS;
|
||||||
|
lex->name=0;
|
||||||
}
|
}
|
||||||
'(' key_list ')' opt_fulltext_parser
|
'(' key_list ')' opt_fulltext_parser
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user