diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-05 18:23:55 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-05 18:23:55 +0400 |
| commit | 462a6f7d1a88297df119cbf5a055716288c2fa6a (patch) | |
| tree | 495a3b2534c49474976e5fdc93f037c26ab70c10 /mysql-test/r/func_str.result | |
| parent | 62617b09c3ffd2fbd512f6a038dfa20a37df4c3b (diff) | |
| download | mariadb-git-462a6f7d1a88297df119cbf5a055716288c2fa6a.tar.gz | |
merging
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index d6879a8e756..d0809eca65b 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -722,9 +722,9 @@ Warning 1265 Data truncated for column 'format(130,10)' at row 1 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `bin(130)` varchar(64) NOT NULL default '', - `oct(130)` varchar(64) NOT NULL default '', - `conv(130,16,10)` varchar(64) NOT NULL default '', + `bin(130)` varchar(64) default NULL, + `oct(130)` varchar(64) default NULL, + `conv(130,16,10)` varchar(64) default NULL, `hex(130)` varchar(6) NOT NULL default '', `char(130)` varbinary(4) NOT NULL default '', `format(130,10)` varchar(4) NOT NULL default '', |