diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-14 09:21:09 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-14 09:21:09 -0400 |
| commit | 6f40704efdf2664492f5d75433c219409ac303a3 (patch) | |
| tree | 1413553a55860d380b053d6126573d5136519e20 /mysql-test/r/mysql.result | |
| parent | 2dd39f521416c5b8b2eac7441c2c64cc57baa481 (diff) | |
| parent | 306827a5ccb5c92b964b847e4927601b9fecd5ae (diff) | |
| download | mariadb-git-6f40704efdf2664492f5d75433c219409ac303a3.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Manual merge.
mysql-test/t/mysql.test:
Manual merge.
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 99633f5e12a..7dbff4beca5 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,6 +114,13 @@ c_cp932 | 2 | NULL | | 3 | | +------+------+ +unhex('zz') +NULL ++-------------+ +| unhex('zz') | ++-------------+ +| NULL | ++-------------+ create table t1(a int, b varchar(255), c int); Field Type Null Key Default Extra a int(11) YES NULL |