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/t/func_str.test | |
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/t/func_str.test')
-rw-r--r-- | mysql-test/t/func_str.test | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 85cedee0f4a..dee06231deb 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -666,7 +666,14 @@ select rpad(i, 7, ' ') as t from t1; --disable_metadata drop table t1; -# End of 4.1 tests +# +# Bug #10418: LOAD_FILE does not behave like in manual if file does not exist +# + +select load_file("lkjlkj"); +select ifnull(load_file("lkjlkj"),"it's null"); + +--echo End of 4.1 tests # # Bug #13361: SELECT FORMAT(<decimal field with null>, 2) crashes |