Commit 37e6bfd7 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 6dc4a129 0490cb5b

mysql-test/r/ndb_bitfield.result

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( 
  `pk1` int(11) NOT NULL,

  `b` bit(64) DEFAULT NULL,

  PRIMARY KEY (`pk1`)

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

insert into t1 values 

(0,b'1111111111111111111111111111111111111111111111111111111111111111'),

(1,b'1000000000000000000000000000000000000000000000000000000000000000'),

mysql-test/r/ndb_dd_basic.result

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY (`pk1`)

) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

INSERT INTO t1 VALUES (0, 0, 0);

SELECT * FROM t1;

pk1	b	c

mysql-test/r/ndb_dd_disk2memory.result

+4 −4
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ t2 CREATE TABLE `t2` ( 
  `b2` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY (`pk2`)

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

SHOW CREATE TABLE test.t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -226,7 +226,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY (`pk1`)

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK

ENGINE=NDB;

SHOW CREATE TABLE test.t2;
@@ -236,7 +236,7 @@ t2 CREATE TABLE `t2` ( 
  `b2` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY (`pk2`)

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

ALTER TABLE test.t1 ENGINE=NDBCLUSTER;

SHOW CREATE TABLE test.t1;

Table	Create Table
@@ -245,7 +245,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY (`pk1`)

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1



DROP TABLE test.t1;

DROP TABLE test.t2;

mysql-test/r/ndb_gis.result

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ gis_point CREATE TABLE `gis_point` ( 
  `fid` int(11) NOT NULL AUTO_INCREMENT,

  `g` point DEFAULT NULL,

  PRIMARY KEY (`fid`)

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	NO	PRI	NULL	auto_increment
@@ -476,7 +476,7 @@ gis_point CREATE TABLE `gis_point` ( 
  `fid` int(11) NOT NULL AUTO_INCREMENT,

  `g` point DEFAULT NULL,

  PRIMARY KEY (`fid`)

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	NO	PRI	NULL	auto_increment

mysql-test/r/ndb_partition_key.result

+42 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

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

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

alter table t1

partition by key(a)

(partition p0 engine=ndb, partition p1);
@@ -197,3 +197,44 @@ ENGINE=NDB 
PARTITION BY KEY(c3);

ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;

DROP TABLE t1;

create table t1 (a int) engine = ndb;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

alter table t1 add column b int;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

alter table t1 engine = myisam;

alter table t1 engine = ndb;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=ndbcluster DEFAULT CHARSET=latin1

alter table t1 coalesce partition 1;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

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

drop table t1 ;

create table t1 (a int) engine = ndb;

alter table t1 add partition partitions 1;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

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

drop table t1;

CREATE TABLE t1 (a int)

PARTITION BY KEY(a)

(PARTITION p0 ENGINE = NDB);

DROP TABLE t1;