diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-13 11:41:41 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-13 11:41:41 -0400 |
commit | 306827a5ccb5c92b964b847e4927601b9fecd5ae (patch) | |
tree | a5f1f2c07aca67c9630a82a7f968a47bc7d90961 /mysql-test/r/mysql.result | |
parent | d31a3434650a9991bcc16478e65efd7d2ea23c76 (diff) | |
download | mariadb-git-306827a5ccb5c92b964b847e4927601b9fecd5ae.tar.gz |
Bug #21618: NULL shown as empty string in client
The column's NOT NULL flag doesn't affect what we should print. Remove the
wrong logic that does check it.
Also, verify that this and the previous two tests print the same data as
other output formats.
client/mysql.cc:
Don't check the column's NOT NULL flag when determining whether to print
"NULL" or not.
mysql-test/r/mysql.result:
Add results and confirm that the other output forms give the same results
for other similar tests.
mysql-test/t/mysql.test:
Add regression tests for this bug and two similar bugs.
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r-- | mysql-test/r/mysql.result | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index d70366a7589..44e8da17eaa 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -85,6 +85,12 @@ c_cp932 | NULL | NULL | Τη γλώσσα | | NULL | NULL | ᛖᚴ ᚷᛖᛏ | +------+------+---------------------------+ +i j k +NULL 1 NULL +Field Type Null Key Default Extra +i int(11) YES NULL +j int(11) NO +k int(11) YES NULL +------+---+------+ | i | j | k | +------+---+------+ @@ -97,6 +103,10 @@ c_cp932 | j | int(11) | NO | | | | | k | int(11) | YES | | NULL | | +-------+---------+------+-----+---------+-------+ +i s1 +1 x +2 NULL +3 +------+------+ | i | s1 | +------+------+ @@ -104,4 +114,11 @@ c_cp932 | 2 | NULL | | 3 | | +------+------+ +unhex('zz') +NULL ++-------------+ +| unhex('zz') | ++-------------+ +| NULL | ++-------------+ End of 5.0 tests |