diff options
| author | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
| commit | 8a140cb72eecc8295f847a829ac3c692f0b0ddfd (patch) | |
| tree | 5688018d1c55ec2c3e437747634fd4fe63bd4f4e /mysql-test/r/func_test.result | |
| parent | 209802eb79f69afd20b8e21db3b86ff6d9d933ea (diff) | |
| parent | 2f774b479b91cb279c42ce7f191a2ce4993f1890 (diff) | |
| download | mariadb-git-8a140cb72eecc8295f847a829ac3c692f0b0ddfd.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
mysql-test/r/explain.result:
Auto merged
mysql-test/r/func_default.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/having.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/varbinary.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/func_str.result:
Manually merged
mysql-test/t/func_str.test:
Manually 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 512369e4f61..a97e6869d09 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -87,7 +87,7 @@ explain extended select - a from t1; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select -(`test`.`t1`.`a`) AS `- a` from `test`.`t1` +Note 1003 select -('1') AS `- a` from `test`.`t1` drop table t1; select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1; 5 between 0 and 10 between 0 and 1 (5 between 0 and 10) between 0 and 1 |