diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-08 19:08:28 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-08 19:08:28 +0400 |
| commit | 52ce1b7358c1cdac8906e412ab3845935ef33327 (patch) | |
| tree | 159b4f318828e8537baa6d0b846728e8f2a0e84b /mysql-test/r/func_test.result | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| parent | 1631f65dfd757282ac480fd20b3fe7b262f500c5 (diff) | |
| download | mariadb-git-52ce1b7358c1cdac8906e412ab3845935ef33327.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
BUILD/check-cpu:
Auto merged
mysql-test/r/explain.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/explain.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/sp.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_strfunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/func_in.result:
SCCS merged
mysql-test/r/order_by.result:
SCCS merged
mysql-test/r/sp.result:
merging
mysql-test/t/func_in.test:
SCCS merged
mysql-test/t/order_by.test:
SCCS merged
mysql-test/t/view.test:
merging
sql/item_cmpfunc.h:
merging
sql/mysql_priv.h:
merging
sql/sql_select.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/func_test.result')
| -rw-r--r-- | mysql-test/r/func_test.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index 9a5cc666ca8..512369e4f61 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -79,7 +79,7 @@ explain extended select * from t1 where 1 xor 1; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE Warnings: -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where 0 select - a from t1; - a -1 |