diff options
| author | unknown <gluh@eagle.(none)> | 2007-01-24 19:54:40 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-01-24 19:54:40 +0400 |
| commit | d663a34303e600a5e33c6b1ca27fb3e9b1f4646e (patch) | |
| tree | f775cabca54ceb5c24dfb0a8166ff2a9d78c7644 /mysql-test/r/func_in.result | |
| parent | 1b71102f4bc56181e7781e0367bb6f44876a4553 (diff) | |
| parent | 19ce865686ec43780d14ca43aa0d516bf5b36c8b (diff) | |
| download | mariadb-git-d663a34303e600a5e33c6b1ca27fb3e9b1f4646e.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/select.result:
manual merge
mysql-test/r/view.result:
manual merge
mysql-test/t/select.test:
manual merge
mysql-test/t/view.test:
manual merge
Diffstat (limited to 'mysql-test/r/func_in.result')
| -rw-r--r-- | mysql-test/r/func_in.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result index 7336665fa40..cf44c56f061 100644 --- a/mysql-test/r/func_in.result +++ b/mysql-test/r/func_in.result @@ -380,7 +380,7 @@ Warnings: Warning 1292 Truncated incorrect DOUBLE value: 'b' explain select f1 from t1 where f1 in ('a',1); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL t1f1_idx 2 NULL 3 Using where; Using index +1 SIMPLE t1 index t1f1_idx t1f1_idx 2 NULL 3 Using where; Using index select f1 from t1 where f1 in ('a','b'); f1 a @@ -409,7 +409,7 @@ Warning 1292 Truncated incorrect DOUBLE value: 'a' Warning 1292 Truncated incorrect DOUBLE value: 'a' explain select f2 from t2 where f2 in ('a',2); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 index NULL t2f2 5 NULL 3 Using where; Using index +1 SIMPLE t2 index t2f2 t2f2 5 NULL 3 Using where; Using index select f2 from t2 where f2 in ('a','b'); f2 0 @@ -431,6 +431,6 @@ Warning 1292 Truncated incorrect DOUBLE value: 'b' Warning 1292 Truncated incorrect DOUBLE value: 'b' explain select f2 from t2 where f2 in (1,'b'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 index NULL t2f2 5 NULL 3 Using where; Using index +1 SIMPLE t2 index t2f2 t2f2 5 NULL 3 Using where; Using index drop table t1, t2; End of 5.1 tests |