Commit 153f0947 authored by unknown's avatar unknown
Browse files

BUG#17754 

Fixed result files


mysql-test/r/ndb_partition_key.result:
  Fixed result files
mysql-test/r/partition.result:
  Fixed result files
parent a5b8b775

mysql-test/r/ndb_partition_key.result

+8 −8
Original line number Diff line number Diff line
@@ -96,25 +96,25 @@ partition by key(a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)

alter table t1 engine=heap;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1 engine=ndb;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)

alter table t1 engine=heap remove partitioning;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1

alter table t1 engine=ndb

partition by key(a)
@@ -122,7 +122,7 @@ partition by key(a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)

alter table t1

partition by key (a)
@@ -130,13 +130,13 @@ partition by key (a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)

alter table t1 remove partitioning;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

alter table t1

partition by key(a)
@@ -149,7 +149,7 @@ partition by key(a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)

drop table t1;

CREATE TABLE t1 (

mysql-test/r/partition.result

+24 −24
Original line number Diff line number Diff line
@@ -322,31 +322,31 @@ 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) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

alter table t1;

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) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

alter table t1 engine=myisam;

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) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

alter table t1 engine=heap;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1 remove partitioning;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1

drop table t1;

create table t1 (a int)
@@ -357,14 +357,14 @@ 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) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

alter table t1 add column b int remove partitioning;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1

engine=myisam
@@ -373,8 +373,8 @@ partition by key(a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

alter table t1

engine=heap
@@ -383,16 +383,16 @@ partition by key(a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1 engine=myisam, add column c int remove partitioning;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL,

  `c` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1

engine=heap
@@ -401,9 +401,9 @@ partition by key (a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL,

  `c` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1

partition by key (a)
@@ -411,9 +411,9 @@ partition by key (a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL,

  `c` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1

engine=heap
@@ -422,9 +422,9 @@ partition by key (a) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` int(11) default NULL,

  `c` int(11) default NULL

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0  ENGINE = MEMORY, PARTITION p1  ENGINE = MEMORY)

alter table t1

partition by key(a)