database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity

Post-merge fixes and code cleanup

Browse Source
This commit is contained in:
sergefp@mysql.com
2003-12-18 21:07:19 +03:00
parent b1f07034da
commit 50f29b0e9e
6 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/index_merge_bdb.result
View File

@@ -7,7 +7,7 @@ filler char(200),
filler2 char(200),
index(key1),
index(key2),
) type=bdb;
) engine=bdb;
select * from t1 where (key1 >= 2 and key1 <= 10) or (pk >= 4 and pk <=8 );
pk key1 key2 filler filler2
2 2 2 filler-data filler-data-2

2
mysql-test/r/index_merge_innodb2.result
View File

@@ -7,7 +7,7 @@ filler char(200),
filler2 char(200),
index(key1),
index(key2),
) type=innodb;
) engine=innodb;
select * from t1 where (key1 >= 2 and key1 <= 10) or (pk >= 4 and pk <=8 );
pk key1 key2 filler filler2
2 2 2 filler-data filler-data-2

2
mysql-test/t/index_merge_bdb.test
View File

@@ -15,7 +15,7 @@ create table t1 (
filler2 char(200),
index(key1),
index(key2),
) type=bdb;
) engine=bdb;
--disable_query_log

2
mysql-test/t/index_merge_innodb2.test
View File

@@ -15,7 +15,7 @@ create table t1 (
filler2 char(200),
index(key1),
index(key2),
) type=innodb;
) engine=innodb;
--disable_query_log