diff options
| author | unknown <pem@mysql.comhem.se> | 2004-05-14 16:00:57 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-05-14 16:00:57 +0200 |
| commit | 3a272c1fa91121d3792a558840d2b764d758f4e9 (patch) | |
| tree | d27d078b95ca20c323af435a836f475562c863d0 /mysql-test/r/index_merge_innodb2.result | |
| parent | e9c1e75b48e5d2c0047a3e88b35667a33d6395e4 (diff) | |
| download | mariadb-git-3a272c1fa91121d3792a558840d2b764d758f4e9.tar.gz | |
Post-merge fixes.
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
mysql-test/r/index_merge.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_bdb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb2.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/rpl_server_id1.result:
Update result after merge.
mysql-test/r/sp-error.result:
Update result after merge.
mysql-test/r/variables.result:
Update result after merge.
mysql-test/t/index_merge.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_bdb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb2.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/sp-error.test:
Post-merge fix of error codes.
sql/opt_range.cc:
Manually merged by Monty.
sql/opt_range.h:
Manually merged by Monty.
sql/slave.cc:
Post-merge fixes with some help from Guilhem.
sql/slave.h:
Post-merge fixes with some help from Guilhem.
sql/sp_head.cc:
Got rid of warning (reordering initialization).
sql/sql_parse.cc:
Post-merge fix: Need to set/reset select_limit at SP CALL time as well.
tests/client_test.c:
Post-merge fix: key_len length in explain has changed.
Diffstat (limited to 'mysql-test/r/index_merge_innodb2.result')
| -rw-r--r-- | mysql-test/r/index_merge_innodb2.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/index_merge_innodb2.result b/mysql-test/r/index_merge_innodb2.result index ee0439a7660..91dd989fe90 100644 --- a/mysql-test/r/index_merge_innodb2.result +++ b/mysql-test/r/index_merge_innodb2.result @@ -6,7 +6,7 @@ key2 int, filler char(200), filler2 char(200), index(key1), -index(key2), +index(key2) ) engine=innodb; select * from t1 where (key1 >= 2 and key1 <= 10) or (pk >= 4 and pk <=8 ); pk key1 key2 filler filler2 |