diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
| commit | 4845099ba95360a360c6b4ca237f7834d84b50b8 (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /mysql-test/t/null.test | |
| parent | a26d31d5dd34bc00eeb13a48073d9fe337b45955 (diff) | |
| parent | cd5544ca62a70f3b1847e82c690c89278a7a8ea4 (diff) | |
| download | mariadb-git-4845099ba95360a360c6b4ca237f7834d84b50b8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/ctype_ucs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/null.test')
| -rw-r--r-- | mysql-test/t/null.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/null.test b/mysql-test/t/null.test index 4aec745f3f7..65e09b006ec 100644 --- a/mysql-test/t/null.test +++ b/mysql-test/t/null.test @@ -177,7 +177,7 @@ drop table t1; # non-null string collation, i.e. case insensitively, # rather than according to NULL's collation, i.e. case sensitively # --- in field +# in field select case 'str' when 'STR' then 'str' when null then 'null' end as c01, case 'str' when null then 'null' when 'STR' then 'str' end as c02, |