diff options
author | unknown <igor@rurik.mysql.com> | 2003-12-23 02:24:12 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2003-12-23 02:24:12 -0800 |
commit | b02b6c708eb56c890cbc9a08c73e9f88c4645fcb (patch) | |
tree | 5e777a4d18231796e5654856dfb16db8d8a4cd75 /mysql-test/r/func_test.result | |
parent | d4898d174c7e728a66831a299b8dddfd5ca6e802 (diff) | |
parent | 9c264e4ad27731b17bddf6369792c78ecc91d626 (diff) | |
download | mariadb-git-b02b6c708eb56c890cbc9a08c73e9f88c4645fcb.tar.gz |
Auto Merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/opt_range.cc:
Merge
Diffstat (limited to 'mysql-test/r/func_test.result')
-rw-r--r-- | mysql-test/r/func_test.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index 4bb2e067f9c..6edc4a5485d 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -74,9 +74,9 @@ select * from t1 where 1 xor 1; a explain extended select * from t1 where 1 xor 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE Warnings: -Note 1003 select high_priority test.t1.a AS `a` from test.t1 where (1 xor 1) +Note 1003 select high_priority test.t1.a AS `a` from test.t1 select - a from t1; - a -1 |