Commit 0ac72194 authored by unknown's avatar unknown
Browse files

Many files: 

  Small corrections after a bad merge


mysql-test/r/partition.result:
  Small corrections after a bad merge
mysql-test/r/partition_02myisam.result:
  Small corrections after a bad merge
mysql-test/r/partition_mgm.result:
  Small corrections after a bad merge
mysql-test/r/partition_range.result:
  Small corrections after a bad merge
parent af17f788

mysql-test/r/partition.result

+15 −15
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) PARTITION BY KEY (a) (PARTITION p0)

) /*!50100 PARTITION BY KEY (a) (PARTITION p0) */

set session sql_mode='';

drop table t1;

create table t1 (a int)

mysql-test/r/partition_mgm.result

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ Table Create Table 
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 

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2  */

ALTER TABLE t1 COALESCE PARTITION 1;

SHOW CREATE TABLE t1;

Table	Create Table

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 
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1  */

mysql-test/r/partition_range.result

+4 −4
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */

drop table t1;

create table t1 (a bigint unsigned)

partition by range (a)
@@ -386,7 +386,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */

insert into t1 values (0xFFFFFFFFFFFFFFFF);

ERROR HY000: Table has no partition for value 18446744073709551615

drop table t1;

mysql-test/r/partition_02myisam.result

+22 −22

File changed.

Contains only whitespace changes.