Pre push fixes
Test file fixes for bugs 20129, 31931 and 34225
This commit is contained in:
parent
2bf256f8dd
commit
eaac5d5f3a
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1416,6 +1416,7 @@ PARTITION BY HASH(f_int1)
|
|||||||
( PARTITION part1 STORAGE ENGINE = 'InnoDB',
|
( PARTITION part1 STORAGE ENGINE = 'InnoDB',
|
||||||
PARTITION part2
|
PARTITION part2
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1427,6 +1428,7 @@ PARTITION BY HASH(f_int1)
|
|||||||
( PARTITION part1 ,
|
( PARTITION part1 ,
|
||||||
PARTITION part2 STORAGE ENGINE = 'InnoDB'
|
PARTITION part2 STORAGE ENGINE = 'InnoDB'
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1443,6 +1445,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
|
# this should fail with ER_MIX_HANDLER_ERROR
|
||||||
|
# after fixing Bug#33722
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1918,6 +1923,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
|
# this should work
|
||||||
|
# after fixing Bug#33722
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1934,6 +1942,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = 'InnoDB'
|
|||||||
(SUBPARTITION subpart21,
|
(SUBPARTITION subpart21,
|
||||||
SUBPARTITION subpart22)
|
SUBPARTITION subpart22)
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# 5 Precedence of storage engine assignments (if there is any)
|
# 5 Precedence of storage engine assignments (if there is any)
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -2862,6 +2871,7 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# 6 Session default engine differs from engine used within create table
|
# 6 Session default engine differs from engine used within create table
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
|
@ -1450,6 +1450,7 @@ PARTITION BY HASH(f_int1)
|
|||||||
( PARTITION part1 STORAGE ENGINE = 'MyISAM',
|
( PARTITION part1 STORAGE ENGINE = 'MyISAM',
|
||||||
PARTITION part2
|
PARTITION part2
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1461,6 +1462,7 @@ PARTITION BY HASH(f_int1)
|
|||||||
( PARTITION part1 ,
|
( PARTITION part1 ,
|
||||||
PARTITION part2 STORAGE ENGINE = 'MyISAM'
|
PARTITION part2 STORAGE ENGINE = 'MyISAM'
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1477,6 +1479,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
|
# this should fail with ER_MIX_HANDLER_ERROR
|
||||||
|
# after fixing Bug#33722
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1966,6 +1971,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
|
# this should work
|
||||||
|
# after fixing Bug#33722
|
||||||
CREATE TABLE t1 (
|
CREATE TABLE t1 (
|
||||||
f_int1 INTEGER,
|
f_int1 INTEGER,
|
||||||
f_int2 INTEGER,
|
f_int2 INTEGER,
|
||||||
@ -1982,6 +1990,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = 'MyISAM'
|
|||||||
(SUBPARTITION subpart21,
|
(SUBPARTITION subpart21,
|
||||||
SUBPARTITION subpart22)
|
SUBPARTITION subpart22)
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# 5 Precedence of storage engine assignments (if there is any)
|
# 5 Precedence of storage engine assignments (if there is any)
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -2934,6 +2943,7 @@ PARTITION part2 VALUES LESS THAN (2147483646)
|
|||||||
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
(SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM',
|
||||||
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM')
|
||||||
);
|
);
|
||||||
|
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# 6 Session default engine differs from engine used within create table
|
# 6 Session default engine differs from engine used within create table
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
|
@ -7,17 +7,10 @@ part_supported_sql_func_ndb : cannot create t1
|
|||||||
partition_alter1_ndb : timeout. Needs too much time.
|
partition_alter1_ndb : timeout. Needs too much time.
|
||||||
partition_alter2_ndb : cannot create t1
|
partition_alter2_ndb : cannot create t1
|
||||||
partition_basic_ndb : cannot create t1
|
partition_basic_ndb : cannot create t1
|
||||||
partition_bit_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_bit_ndb : cannot create t1
|
partition_bit_ndb : cannot create t1
|
||||||
partition_char_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_datetime_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_decimal_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_engine_ndb : cannot create t1
|
partition_engine_ndb : cannot create t1
|
||||||
partition_float_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_int_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_int_ndb : cannot create t1
|
partition_int_ndb : cannot create t1
|
||||||
partition_sessions : needs system_3_init.inc
|
partition_sessions : needs system_3_init.inc
|
||||||
partition_special_myisam : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
|
|
||||||
partition_syntax_ndb : cannot create t1
|
partition_syntax_ndb : cannot create t1
|
||||||
partition_value_innodb : Bug#30581 partition_value tests use disallowed CAST() function
|
partition_value_innodb : Bug#30581 partition_value tests use disallowed CAST() function
|
||||||
partition_value_myisam : Bug#30581 partition_value tests use disallowed CAST() function
|
partition_value_myisam : Bug#30581 partition_value tests use disallowed CAST() function
|
||||||
|
@ -1028,6 +1028,7 @@ int ha_partition::repair_partitions(THD *thd)
|
|||||||
0 Success
|
0 Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef WL4176_IS_DONE
|
||||||
static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
|
static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
|
||||||
handler *file, uint flag)
|
handler *file, uint flag)
|
||||||
{
|
{
|
||||||
@ -1041,7 +1042,6 @@ static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
|
|||||||
*/
|
*/
|
||||||
DBUG_RETURN(HA_ADMIN_NOT_IMPLEMENTED);
|
DBUG_RETURN(HA_ADMIN_NOT_IMPLEMENTED);
|
||||||
|
|
||||||
#ifdef WL4176_IS_DONE
|
|
||||||
if (flag == OPTIMIZE_PARTS)
|
if (flag == OPTIMIZE_PARTS)
|
||||||
error= file->ha_optimize(thd, check_opt);
|
error= file->ha_optimize(thd, check_opt);
|
||||||
else if (flag == ANALYZE_PARTS)
|
else if (flag == ANALYZE_PARTS)
|
||||||
@ -1058,8 +1058,8 @@ static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
|
|||||||
if (error == HA_ADMIN_ALREADY_DONE)
|
if (error == HA_ADMIN_ALREADY_DONE)
|
||||||
error= 0;
|
error= 0;
|
||||||
DBUG_RETURN(error);
|
DBUG_RETURN(error);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1080,11 +1080,13 @@ static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
|
|||||||
int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
|
int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
|
||||||
uint flag, bool all_parts)
|
uint flag, bool all_parts)
|
||||||
{
|
{
|
||||||
|
#ifdef WL4176_IS_DONE
|
||||||
List_iterator<partition_element> part_it(m_part_info->partitions);
|
List_iterator<partition_element> part_it(m_part_info->partitions);
|
||||||
uint no_parts= m_part_info->no_parts;
|
uint no_parts= m_part_info->no_parts;
|
||||||
uint no_subparts= m_part_info->no_subparts;
|
uint no_subparts= m_part_info->no_subparts;
|
||||||
uint i= 0;
|
uint i= 0;
|
||||||
int error;
|
int error;
|
||||||
|
#endif
|
||||||
DBUG_ENTER("ha_partition::handle_opt_partitions");
|
DBUG_ENTER("ha_partition::handle_opt_partitions");
|
||||||
DBUG_PRINT("enter", ("all_parts %u, flag= %u", all_parts, flag));
|
DBUG_PRINT("enter", ("all_parts %u, flag= %u", all_parts, flag));
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user