diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-06 16:06:10 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-06 16:06:10 +0500 |
commit | e739ca87433d358645d06d9eec913c835868e1ef (patch) | |
tree | 632cb9c59c2d634c2e0712f85d1189b178e0731b /mysql-test | |
parent | 3bed20c39c63f17debc4234197a6ebc537462e9a (diff) | |
download | mariadb-git-e739ca87433d358645d06d9eec913c835868e1ef.tar.gz |
merging fix
mysql-test/r/type_set.result:
result fixed
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/type_set.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result index a75438293f6..877400ab7e1 100644 --- a/mysql-test/r/type_set.result +++ b/mysql-test/r/type_set.result @@ -82,6 +82,6 @@ Note 1291 Column 'f1' has duplicated value '1' in SET show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` set('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','1') default NULL + `f1` set('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','1') DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; |