summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-04-16 17:17:36 -0400
committerunknown <cmiller@zippy.(none)>2006-04-16 17:17:36 -0400
commit327822a425e84c66e3ba5f47e8e1ddfebd644a8f (patch)
treeb40174b3cbc583c8d1182864e3a22242236cde4d /mysql-test/r/mysql.result
parent76aa492314071a9457a307985815c2974499744b (diff)
downloadmariadb-git-327822a425e84c66e3ba5f47e8e1ddfebd644a8f.tar.gz
Only expand the empty string to the letters "NULL" if the column
does not have "NOT NULL" attribute set. Also, calculate the padding characters more safely, so that a negative number doesn't cause it to print MAXINT-n spaces. mysql-test/r/mysql.result: Add test result. mysql-test/t/mysql.test: Add test.
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index ae50c714bba..a067d3ad0f8 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -85,3 +85,15 @@ 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 | | NULL | |
+| k | int(11) | YES | | NULL | |
++-------+---------+------+-----+---------+-------+