diff options
| author | unknown <timour/tkatchaounov@lamia.home> | 2006-07-21 13:04:40 +0300 |
|---|---|---|
| committer | unknown <timour/tkatchaounov@lamia.home> | 2006-07-21 13:04:40 +0300 |
| commit | f57bb34775c7482e15a6d067873730f9434726e8 (patch) | |
| tree | b9393caee4a9e94830f70cbcd75f0e00253508c0 /mysql-test/r/func_str.result | |
| parent | f8dda7bfb928c0eaee550db57f5288e0575ea378 (diff) | |
| parent | 4e59d30dc9ef76c79c8e8c92bfad9b394d4d5c9b (diff) | |
| download | mariadb-git-f57bb34775c7482e15a6d067873730f9434726e8.tar.gz | |
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into lamia.home:/home/tkatchaounov/autopush/5.0-bug-21007
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index a857f5055a2..14da630f61e 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -33,6 +33,9 @@ instr('hello','HE') instr('hello',binary 'HE') instr(binary 'hello','HE') select position(binary 'll' in 'hello'),position('a' in binary 'hello'); position(binary 'll' in 'hello') position('a' in binary 'hello') 3 0 +select left('hello',null), right('hello',null); +left('hello',null) right('hello',null) +NULL NULL select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5) ; left('hello',2) right('hello',2) substring('hello',2,2) mid('hello',1,5) he lo el hello |