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

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_charset.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents c2e8969a 2d26aa37

mysql-test/r/ndb_charset.result

+4 −4
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ unique key(a) 
) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

ERROR 23000: Duplicate entry '2' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

insert into t1 values(3, 'AAA');

ERROR 23000: Duplicate entry '3' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t1 order by p;

p	a

1	aAa
@@ -138,9 +138,9 @@ unique key(a) 
) engine=ndb;

insert into t1 values (1,'A'),(2,'b '),(3,'C  '),(4,'d      '),(5,'E'),(6,'f');

insert into t1 values(99,'b');

ERROR 23000: Duplicate entry '99' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

insert into t1 values(99,'a         ');

ERROR 23000: Duplicate entry '99' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select a,length(a) from t1 order by a;

a	length(a)

A	1

mysql-test/r/ndb_index_unique.result

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a; 
a	b	c

3	4	6

insert into t1 values(8, 2, 3);

ERROR 23000: Duplicate entry '8' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t1 order by a;

a	b	c

1	2	3
@@ -93,7 +93,7 @@ a b c 
1	1	1

4	4	NULL

insert into t1 values(5,1,1);

ERROR 23000: Duplicate entry '5' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

drop table t1;

CREATE TABLE t2 (

a int unsigned NOT NULL PRIMARY KEY,
@@ -116,7 +116,7 @@ select * from t2 where b = 4 order by a; 
a	b	c

3	4	6

insert into t2 values(8, 2, 3);

ERROR 23000: Duplicate entry '8' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t2 order by a;

a	b	c

1	2	3
@@ -181,7 +181,7 @@ pk a 
3	NULL

4	4

insert into t1 values (5,0);

ERROR 23000: Duplicate entry '5' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t1 order by pk;

pk	a

-1	NULL
@@ -214,7 +214,7 @@ pk a b c 
0	NULL	18	NULL

1	3	19	abc

insert into t2 values(2,3,19,'abc');

ERROR 23000: Duplicate entry '2' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t2 order by pk;

pk	a	b	c

-1	1	17	NULL
@@ -634,7 +634,7 @@ create table t1 (a int primary key, b varchar(1000) not null, unique key (b)) 
engine=ndb charset=utf8;

insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));

insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));

ERROR 23000: Duplicate entry '2' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select a, sha1(b) from t1;

a	sha1(b)

1	08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d

mysql-test/r/ndb_update.result

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ pk1 b c 
2	2	2

4	1	1

UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;

ERROR 23000: Duplicate entry '1' for key 'PRIMARY'

ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'

select * from t1 order by pk1;

pk1	b	c

0	0	0

mysql-test/r/partition.result

+0 −42
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (s1 char(2) character set utf8)

partition by list (case when s1 > 'cz' then 1 else 2 end)

(partition p1 values in (1),

partition p2 values in (2));

drop table t1;

create table t1 (a int)

partition by key(a)

partitions 0.2+e1;
@@ -21,32 +16,6 @@ partition by key(a) 
partitions 1e+300;

ERROR 42000: Only integers allowed as number here near '1e+300' at line 3

create table t1 (a int)

engine = innodb

partition by key (a);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (0), (1), (2), (3);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	4	4096	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

drop table t1;

create table t1 (a int auto_increment primary key)

engine = innodb

partition by key (a);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	2	8192	16384	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (NULL), (NULL), (NULL), (NULL);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	4	4096	16384	0	0	0	5	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (NULL), (NULL), (NULL), (NULL);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	8	2048	16384	0	0	0	9	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

drop table t1;

create table t1 (a int)

partition by key (a)

(partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');

ERROR 42000: Incorrect table name 'part-data'
@@ -1042,17 +1011,6 @@ set session sql_mode=''; 
drop table t1;

create table t1 (a int)

partition by key (a)

(partition p1 engine = innodb);

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

drop table t1;

create table t1 (a int)

partition by key (a)

(partition p0 engine = MERGE);

ERROR HY000: Engine cannot be used in partitioned tables

create table t1 (a varchar(1))

mysql-test/r/partition_error.result

+0 −24
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a int)

engine = x

partition by key (a);

Warnings:

Error	1286	Unknown table engine 'x'

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a)  */

drop table t1;

create table t1 (a int)

engine = innodb

partition by list (a)

(partition p0 values in (0));

alter table t1 engine = x;

Warnings:

Error	1286	Unknown table engine 'x'

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */

drop table t1;

partition by list (a)

partitions 3

(partition x1 values in (1,2,9,4) tablespace ts1,