diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-06-22 01:25:57 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-06-22 01:25:57 +0200 |
| commit | 993920327752b22895332c0af4b0f6032f27f972 (patch) | |
| tree | 6fb675dcf0a003564533e94a37f0dc9187b1bcb6 /mysql-test/r/partition_mgm.result | |
| parent | a8a6fdee39dcc2772eef8f0a5e56bf6182439d96 (diff) | |
| parent | 581d49d9bc3fd9403377ba78c157bad19a5b7ee1 (diff) | |
| download | mariadb-git-993920327752b22895332c0af4b0f6032f27f972.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
mysql-test/r/partition_error.result:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/partition.result:
Auto merged
Diffstat (limited to 'mysql-test/r/partition_mgm.result')
| -rw-r--r-- | mysql-test/r/partition_mgm.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index 70bd1d6decf..0f2c8c57872 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -7,6 +7,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2 */ +hello/master-data/test/t1#P#p0.MYD +hello/master-data/test/t1#P#p0.MYI +hello/master-data/test/t1#P#p1.MYD +hello/master-data/test/t1#P#p1.MYI +hello/master-data/test/t1.frm +hello/master-data/test/t1.par ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; Table Create Table @@ -14,3 +20,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1 */ +hello/master-data/test/t1#P#p0.MYD +hello/master-data/test/t1#P#p0.MYI +hello/master-data/test/t1.frm +hello/master-data/test/t1.par |