summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-05-09 22:35:51 -0400
committerunknown <cmiller@zippy.(none)>2006-05-09 22:35:51 -0400
commit3ca18a1f8d5706c75bde9301bc32e260c3f98c9e (patch)
tree69526931aa8a9484857bf00d581ffa85544a9dbe /mysql-test/r/mysql.result
parent0a5bbd9c4bfa4be812630d22acd36cf737237397 (diff)
downloadmariadb-git-3ca18a1f8d5706c75bde9301bc32e260c3f98c9e.tar.gz
Bug#19564: mysql displays NULL instead of space
Correct a bug (that I introduced, after using Oracle's database software for too many years) where the length of the database-sent data is incorrectly used to infer NULLness. client/mysql.cc: No longer use the length of the data to infer whether it is NULL or not. mysql-test/r/mysql.result: Add result and version marker, and correct previous result. mysql-test/t/mysql.test: Add test and version marker
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result12
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index a067d3ad0f8..4b7084e813c 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -74,7 +74,7 @@ c_cp932
+----------------------+------------+--------+
| >a < | b | 123421 |
| >a < | 0123456789 | 4 |
-| >abcd< | NULL | 4 |
+| >abcd< | | 4 |
+----------------------+------------+--------+
+------+------+---------------------------+
| i | j | k |
@@ -94,6 +94,14 @@ c_cp932
| Field | Type | Null | Key | Default | Extra |
+-------+---------+------+-----+---------+-------+
| i | int(11) | YES | | NULL | |
-| j | int(11) | NO | | NULL | |
+| j | int(11) | NO | | | |
| k | int(11) | YES | | NULL | |
+-------+---------+------+-----+---------+-------+
++------+------+
+| i | s1 |
++------+------+
+| 1 | x |
+| 2 | NULL |
+| 3 | |
++------+------+
+End of 5.0 tests