diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-06 11:39:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-06 11:39:36 +0100 |
| commit | 9c75f120470d2dadd5a29db449b0e7c376bf7983 (patch) | |
| tree | ebd1254d595b663b63a532cd1207e1e87802aa4c /mysql-test/r/partition_mgm_err.result | |
| parent | 82e1b9859e7c6219a3ef6965079e8338628695a6 (diff) | |
| parent | a9d32586b15a2e583cb6e3df3c0b40a76b3a8fbc (diff) | |
| download | mariadb-git-9c75f120470d2dadd5a29db449b0e7c376bf7983.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_02myisam.result:
Auto merged
mysql-test/r/partition_mgm_err.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/archive_gis.result:
Merge bug10460
mysql-test/r/bdb_gis.result:
Merge bug10460
mysql-test/r/func_system.result:
Merge bug10460
mysql-test/r/innodb_gis.result:
Merge bug10460
mysql-test/r/ndb_gis.result:
Merge bug10460
Diffstat (limited to 'mysql-test/r/partition_mgm_err.result')
| -rw-r--r-- | mysql-test/r/partition_mgm_err.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/r/partition_mgm_err.result index 32b28ae15c6..c7003c6e14c 100644 --- a/mysql-test/r/partition_mgm_err.result +++ b/mysql-test/r/partition_mgm_err.result @@ -129,13 +129,13 @@ CREATE TABLE t1 (a INT); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 PARTITION BY KEY(a) PARTITIONS 2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY (a) PARTITIONS 2 DROP TABLE t1; CREATE TABLE t1 (a INT) PARTITION BY HASH(a); |