diff options
| author | unknown <tnurnberg@mysql.com> | 2006-05-12 10:27:20 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com> | 2006-05-12 10:27:20 +0200 |
| commit | 98912fb95c8cc84344063fcd9bdded8c9d86e582 (patch) | |
| tree | 8dab981ba0cfeef2555a11afd8d5ef84ea2b7515 /mysql-test/r/func_str.result | |
| parent | 5c6d923f3095f5eca3abaa5277350bec90e4970c (diff) | |
| parent | ec83dd7c61f4e29122ecff278ca81b03bd51b271 (diff) | |
| download | mariadb-git-98912fb95c8cc84344063fcd9bdded8c9d86e582.tar.gz | |
Merge mysql.com:/home/mysql-4.1-10418
into mysql.com:/home/mysql-5.0-10418
mysql-test/t/outfile.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/r/func_str.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/r/outfile.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/t/func_str.test:
show that load_file() will return NULL rather than throw an error
if file doesn't exist
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index aed79e7f8fa..6f8269bdcbd 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1017,6 +1017,13 @@ t 1000000 1 drop table t1; +select load_file("lkjlkj"); +load_file("lkjlkj") +NULL +select ifnull(load_file("lkjlkj"),"it's null"); +ifnull(load_file("lkjlkj"),"it's null") +it's null +End of 4.1 tests create table t1 (d decimal default null); insert into t1 values (null); select format(d, 2) from t1; |