mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Pre push fixes

Browse source 
Test file fixes for bugs 20129, 31931 and 34225


mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
  Manual merge, new test case to be modified for Bug#20129
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
  Manual merge, new test case to be modified for Bug#20129
mysql-test/suite/parts/r/partition_engine_innodb.result:
  Manual merge, fix for bug#31931
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Manual merge, fix for bug#31931
mysql-test/suite/parts/t/disabled.def:
  These should work now since Bug#34225 is fixed
sql/ha_partition.cc:
  Bug#20129: partition maintenance command not working with crashed tables
  
  Fix for compiler warnings.
This commit is contained in:
unknown 2008-02-24 19:13:18 +01:00
commit c37fdbcdfd
6 changed files with 449 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

474
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
View file

File diff suppressed because it is too large Load diff

376
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
View file

File diff suppressed because it is too large Load diff

10
mysql-test/suite/parts/r/partition_engine_innodb.result
View file

@ -1416,6 +1416,7 @@ PARTITION BY HASH(f_int1)
( PARTITION part1 STORAGE ENGINE = 'InnoDB',
PARTITION part2
);
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
CREATE TABLE t1 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1427,6 +1428,7 @@ PARTITION BY HASH(f_int1)
( PARTITION part1 ,
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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1443,6 +1445,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1918,6 +1923,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1934,6 +1942,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = 'InnoDB'
(SUBPARTITION subpart21,
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)
#------------------------------------------------------------------------
@ -2862,6 +2871,7 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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
#------------------------------------------------------------------------

10
mysql-test/suite/parts/r/partition_engine_myisam.result
View file

@ -1450,6 +1450,7 @@ PARTITION BY HASH(f_int1)
( PARTITION part1 STORAGE ENGINE = 'MyISAM',
PARTITION part2
);
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
CREATE TABLE t1 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1461,6 +1462,7 @@ PARTITION BY HASH(f_int1)
( PARTITION part1 ,
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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1477,6 +1479,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1966,6 +1971,9 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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 (
f_int1 INTEGER,
f_int2 INTEGER,
@ -1982,6 +1990,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = 'MyISAM'
(SUBPARTITION subpart21,
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)
#------------------------------------------------------------------------
@ -2934,6 +2943,7 @@ PARTITION part2 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart21 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
#------------------------------------------------------------------------