diff options
| author | unknown <psergey@psergey-rh8.(none)> | 2003-12-18 17:01:35 +0300 |
|---|---|---|
| committer | unknown <psergey@psergey-rh8.(none)> | 2003-12-18 17:01:35 +0300 |
| commit | 29a669e66388ceaae6f8f33d67680fde654fed6a (patch) | |
| tree | 7bef2a9fecbe4cb68d3ebafee3345f9457bba921 /mysql-test/r/index_merge_innodb.result | |
| parent | 7dbdedcb72afa53f8c2d619e32376a1897bc257b (diff) | |
| parent | 1ca25d0e02876cc48f176195840a8dbbc4b4b0e9 (diff) | |
| download | mariadb-git-29a669e66388ceaae6f8f33d67680fde654fed6a.tar.gz | |
Merge psergey-rh8.(none):/home/psergey/mysql-5.0-latest-pull
into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique
mysql-test/r/index_merge_innodb.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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 dc1fdd97723..91718f00f9b 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 |