diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-16 18:09:22 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-16 18:09:22 +0100 |
| commit | bc748bef530dcbcd155f3fe58f68d77520d7d264 (patch) | |
| tree | be183ce29bc6e4de4d8ad928ac2644112ba2951c /mysql-test/r/index_merge_innodb.result | |
| parent | b8fa1718502174c9d4599fd02c9ca0ffa74db1ef (diff) | |
| download | mariadb-git-bc748bef530dcbcd155f3fe58f68d77520d7d264.tar.gz | |
Post-merge fixes.
Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.
client/mysqltest.c:
Post-merge fixes.
mysql-test/r/index_merge_innodb.result:
Post-merge fixes.
mysql-test/r/sp-error.result:
Post-merge fixes.
Removed now obsolete error test for multiple selects (without "into").
mysql-test/r/sp.result:
Post-merge fixes.
Added test for mulple result sets.
mysql-test/r/variables.result:
Post-merge fixes.
mysql-test/t/index_merge_innodb.test:
Post-merge fixes.
mysql-test/t/sp-error.test:
Post-merge fixes.
Removed now obsolete error test for multiple selects (without "into").
mysql-test/t/sp.test:
Post-merge fixes.
Added test for mulple result sets.
sql/lex.h:
Post-merge fixes.
Diffstat (limited to 'mysql-test/r/index_merge_innodb.result')
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index ef6ffa82da7..a5eb882fa00 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -5,7 +5,7 @@ key1 int not null, key2 int not null, INDEX i1(key1), INDEX i2(key2), -) type=innodb; +) engine=innodb; explain select * from t1 where key1 < 5 or key2 > 197; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index_merge i1,i2 i1,i2 4,4 NULL 8 Using where |