database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.1-new.12448
This commit is contained in:
bar@mysql.com
2006-01-19 18:05:57 +04:00
parent fd4ab36123 9a6bad5951
commit 55b30563fb
5 changed files with 11 additions and 7 deletions
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
}
DROP TABLE t1;
DROP TABLE if exists t0_template;

1
mysql-test/r/partition_02myisam.result
View File

@ -1722,3 +1722,4 @@ INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
ALTER TABLE t1 ADD PARTITION (PARTITION part2 VALUES LESS THAN (2147483647)
(SUBPARTITION subpart21));
DROP TABLE t1;
DROP TABLE if exists t0_template;

5
mysql-test/t/disabled.def
View File

@ -26,5 +26,6 @@ rpl_ndb_basic : Bug#16228
rpl_sp : Bug #16456
ndb_autodiscover : Needs to be fixed w.r.t binlog
ndb_autodiscover2 : Needs to be fixed w.r.t binlog
ndb_condition_pushdown: Bug #16596: Crash in mysql_unpack_partition
ndb_index_ordered : Bug #16596: Crash in mysql_unpack_partition
ndb_restore : Needs fixing
system_mysql_db : Needs fixing
system_mysql_db_fix : Needs fixing

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->escape_used= lex->et_compile_phase= FALSE;
lex->name= 0;
lex->et= NULL;
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"));
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);