diff options
| author | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-10-16 15:22:44 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-10-16 15:22:44 +0500 |
| commit | 1590fa13ff044c1c779a11b716394fc76453424e (patch) | |
| tree | d088f9b58f5c24cea64bfeee223058466cb81eab | |
| parent | d3443ee1c7cfc4465c674adf32ba8c119c9212f3 (diff) | |
| download | mariadb-git-1590fa13ff044c1c779a11b716394fc76453424e.tar.gz | |
After merge fix:
Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format
mysql-test/r/ctype_uca.result:
Adjusting SHOW CREATE TABLE output
mysql-test/r/ctype_ucs.result:
Adjusting SHOW CREATE TABLE output
mysql-test/r/ctype_utf8.result:
Adjusting SHOW CREATE TABLE output
mysql-test/r/func_regexp.result:
Adjusting SHOW CREATE TABLE output
| -rw-r--r-- | mysql-test/r/ctype_uca.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ctype_ucs.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ctype_utf8.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/func_regexp.result | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result index ada7ace9696..4980b179c4b 100644 --- a/mysql-test/r/ctype_uca.result +++ b/mysql-test/r/ctype_uca.result @@ -2763,8 +2763,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL, - `s2` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL + `s1` varchar(64) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 delete from t1; insert into t1 values('aaa','aaa'); diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 709a097d823..dab49cdd8bb 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -931,8 +931,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) character set ucs2 default NULL, - `s2` varchar(64) character set ucs2 default NULL + `s1` varchar(64) CHARACTER SET ucs2 DEFAULT NULL, + `s2` varchar(64) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 delete from t1; insert into t1 values('aaa','aaa'); diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index 0981f72b0c1..3575a07d83c 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -276,8 +276,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) character set utf8 default NULL, - `s2` varchar(64) character set utf8 default NULL + `s1` varchar(64) CHARACTER SET utf8 DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 delete from t1; insert into t1 values('aaa','aaa'); diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result index c3851e51207..dca73244780 100644 --- a/mysql-test/r/func_regexp.result +++ b/mysql-test/r/func_regexp.result @@ -8,8 +8,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) default NULL, - `s2` varchar(64) default NULL + `s1` varchar(64) DEFAULT NULL, + `s2` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 delete from t1; insert into t1 values('aaa','aaa'); |