diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-06-15 14:56:00 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-06-15 14:56:00 +0200 |
| commit | af17f788b588a97fde4cbae435ce09b370afb77e (patch) | |
| tree | 966c4edfd16ca0a7798e7fd2d3ce415f417e2e3f /mysql-test/r/partition_mgm.result | |
| parent | 07703f17bd48e7a95c39dd78959d3f2145cc0370 (diff) | |
| parent | ed849efcc176b4d7b500ca69cf0ee7b1ec39f8ab (diff) | |
| download | mariadb-git-af17f788b588a97fde4cbae435ce09b370afb77e.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_range.result:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/partition_mgm.result')
| -rw-r--r-- | mysql-test/r/partition_mgm.result | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index 7b7b5729112..48bbdf57b93 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -7,12 +7,6 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2 -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; Table Create Table @@ -20,7 +14,3 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1 -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par |