mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
This changeset belongs to
WL#3397 Refactoring storage engine test cases (for falcon) It contains fixes according to second code review. - Remove any occurence of hardcoded assignments of storage engines - Use variable names exact telling what it is used for - Updated comments - remove trailing spaces mysql-test/include/handler.inc: - Replace hardcoded MyISAM with assignments via variable mysql-test/include/mix1.inc: - Replace hardcoded MyISAM with assignments via variable - Remove hardcoded InnoDB assignments (They were introduced by late push) - Remove trailing spaces mysql-test/include/mix2.inc: - Replace hardcode MyISAM assignments - Remove trailing spaces - Engine assignments via variable refers to the use of the storage engine $other_non_trans_engine_type, $other_live_chcks_engine_type ... mysql-test/include/read_many_rows.inc: Replace hardcoded MyISAM assignment mysql-test/include/rowid_order.inc: remove trailing spaces mysql-test/r/handler_innodb.result: Updated result mysql-test/r/handler_myisam.result: Updated result mysql-test/r/innodb_mysql.result: Updated result mysql-test/r/mix2_myisam.result: Updated result mysql-test/r/read_many_rows_innodb.result: Updated result mysql-test/r/rowid_order_innodb.result: Updated result mysql-test/t/handler_innodb.test: Introduce $variables mysql-test/t/handler_myisam.test: Introduce $variables mysql-test/t/mix2_myisam.test: Introduce $variables mysql-test/t/read_many_rows_innodb.test: Introduce $variables
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
# include/rowid_order.inc
|
||||
#
|
||||
# Test for rowid ordering (and comparison) functions.
|
||||
# do index_merge select for tables with PK of various types.
|
||||
# do index_merge select for tables with PK of various types.
|
||||
#
|
||||
# The variable
|
||||
# $engine_type -- storage engine to be tested
|
||||
@ -22,8 +22,8 @@ eval SET SESSION STORAGE_ENGINE = $engine_type;
|
||||
drop table if exists t1, t2, t3,t4;
|
||||
--enable_warnings
|
||||
|
||||
# Signed number as rowid
|
||||
create table t1 (
|
||||
# Signed number as rowid
|
||||
create table t1 (
|
||||
pk1 int not NULL,
|
||||
key1 int(11),
|
||||
key2 int(11),
|
||||
@ -40,8 +40,8 @@ explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
|
||||
select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
|
||||
drop table t1;
|
||||
|
||||
# Unsigned numbers as rowids
|
||||
create table t1 (
|
||||
# Unsigned numbers as rowids
|
||||
create table t1 (
|
||||
pk1 int unsigned not NULL,
|
||||
key1 int(11),
|
||||
key2 int(11),
|
||||
@ -58,7 +58,7 @@ select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
|
||||
drop table t1;
|
||||
|
||||
# Case-insensitive char(N)
|
||||
create table t1 (
|
||||
create table t1 (
|
||||
pk1 char(4) not NULL,
|
||||
key1 int(11),
|
||||
key2 int(11),
|
||||
@ -84,7 +84,7 @@ create table t1 (
|
||||
KEY key1 (key1),
|
||||
KEY key2 (key2)
|
||||
);
|
||||
insert into t1 values
|
||||
insert into t1 values
|
||||
(1, 'u', 'u', 1, 1),
|
||||
(1, 'u', char(0xEC), 1, 1),
|
||||
(1, 'u', 'x', 1, 1);
|
||||
|
Reference in New Issue
Block a user