diff options
author | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
commit | 406a5fa7cd48d9bb51e513bd5040a7c3499553cc (patch) | |
tree | 14b4172c5a85ae390a88a1f2da65454dd65a0218 /mysql-test/r/func_str.result | |
parent | 1d9fbbe3ce58dd6ca3793d15f793e2d9cc407133 (diff) | |
download | mariadb-git-406a5fa7cd48d9bb51e513bd5040a7c3499553cc.tar.gz |
After merge fixes
Remove compiler warnings
Update windows project files
VC++Files/innobase/innobase.dsp:
Update project files after merge
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update project files after merge
VC++Files/libmysqld/libmysqld.dsp:
Update project files after merge
VC++Files/myisamchk/myisamchk.dsp:
Update project files after merge
VC++Files/myisamlog/myisamlog.dsp:
Update project files after merge
VC++Files/myisampack/myisampack.dsp:
Update project files after merge
VC++Files/mysqldemb/mysqldemb.dsp:
Update project files after merge
VC++Files/sql/mysqld.dsp:
Update project files after merge
VC++Files/strings/strings.dsp:
Update project files after merge
innobase/include/data0data.ic:
Fix compiler warning
innobase/include/mem0pool.h:
Remove reference to not existing variable (after merge fix)
innobase/srv/srv0srv.c:
Remove reference to not existing variable (after merge fix)
libmysqld/libmysqld.def:
Add function used by test programs
mysql-test/r/func_str.result:
After merge fixes
mysql-test/r/variables.result:
After merge fixes
mysql-test/t/variables.test:
After merge fixes
sql/discover.cc:
Remove not used lable
sql/opt_range.cc:
Removed compiler warnings
strings/ctype-tis620.c:
After merge fixes
Diffstat (limited to 'mysql-test/r/func_str.result')
-rw-r--r-- | mysql-test/r/func_str.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 4e7df9edefa..569b4da0f85 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -305,6 +305,15 @@ i ELT(j, '345', '34') 1 345 2 34 DROP TABLE t1; +create table t1(a char(4)); +insert into t1 values ('one'),(NULL),('two'),('four'); +select a, quote(a), isnull(quote(a)), quote(a) is null, ifnull(quote(a), 'n') from t1; +a quote(a) isnull(quote(a)) quote(a) is null ifnull(quote(a), 'n') +one 'one' 0 0 'one' +NULL NULL 1 1 n +two 'two' 0 0 'two' +four 'four' 0 0 'four' +drop table t1; select 1=_latin1'1'; 1=_latin1'1' 1 |