Commit 3e30762e authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
parents 25df33a7 c78dc0cb

mysql-test/r/ndb_partition_error.result

+9 −0
Original line number Diff line number Diff line
@@ -36,3 +36,12 @@ INSERT INTO t1 VALUES (2); 
UPDATE t1 SET id=5 WHERE id=2;

ERROR HY000: Table has no partition for value 5

DROP TABLE t1;

create table t1 (a int,b int, c int)

engine = ndb

partition by list(a)

partitions 2

(partition x123 values in (11, 12),

partition x234 values in (5, 1));

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

ERROR HY000: Table has no partition for value NULL

drop table t1;

mysql-test/r/partition.result

+49 −0
Original line number Diff line number Diff line
@@ -373,4 +373,53 @@ end// 
call p()//

drop procedure p//

drop table t1//

create table t1 (a int,b int,c int,key(a,b))

partition by range (a)

partitions 3

(partition x1 values less than (0) tablespace ts1,

partition x2 values less than (10) tablespace ts2,

partition x3 values less than maxvalue tablespace ts3);

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

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

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

select partition_name, partition_description, table_rows

from information_schema.partitions where table_schema ='test';

partition_name	partition_description	table_rows

x1	0	1

x2	10	1

x3	MAXVALUE	1

drop table t1;

create table t1 (a int,b int, c int)

partition by list(a)

partitions 2

(partition x123 values in (11,12),

partition x234 values in (1 ,NULL, NULL));

ERROR HY000: Multiple definition of same constant in list partitioning

create table t1 (a int,b int, c int)

partition by list(a)

partitions 2

(partition x123 values in (11, NULL),

partition x234 values in (1 ,NULL));

ERROR HY000: Multiple definition of same constant in list partitioning

create table t1 (a int,b int, c int)

partition by list(a)

partitions 2

(partition x123 values in (11, 12),

partition x234 values in (5, 1));

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

ERROR HY000: Table has no partition for value NULL

drop table t1;

create table t1 (a int,b int, c int)

partition by list(a)

partitions 2

(partition x123 values in (11, 12),

partition x234 values in (NULL, 1));

insert into t1 values (11,1,6);

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

select partition_name, partition_description, table_rows

from information_schema.partitions where table_schema ='test';

partition_name	partition_description	table_rows

x123	11,12	1

x234	NULL,1	1

drop table t1;

End of 5.1 tests

mysql-test/r/rpl_ndb_basic.result

+37 −3
Original line number Diff line number Diff line
@@ -71,13 +71,47 @@ CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0', 
PRIMARY KEY USING HASH (`nid`)) 

ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES(1,"XYZ1","ABC1");

**** On Slave ****

BEGIN;

UPDATE t1 SET `nom`="LOCK" WHERE `nid`=1;

set GLOBAL slave_transaction_retries=1;

**** On Master ****

UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1;

SHOW SLAVE STATUS;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	No				<Replicate_Ignore_Table>			146	Error in Write_rows event: error during transaction execution on table test.t1	0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>

**** On Slave ****

SHOW SLAVE STATUS;;

Slave_IO_State	<Slave_IO_State>

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	<Read_Master_Log_Pos>

Relay_Log_File	<Relay_Log_File>

Relay_Log_Pos	<Relay_Log_Pos>

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	<Replicate_Ignore_Table>

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	146

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1

Skip_Counter	0

Exec_Master_Log_Pos	<Exec_Master_Log_Pos>

Relay_Log_Space	<Relay_Log_Space>

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	<Seconds_Behind_Master>

set GLOBAL slave_transaction_retries=10;

START SLAVE;

select * from t1 order by nid;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ rpl_ddl : Bug#15963 SBR does not show "Definer" correctly 
rpl_ndb_2innodb         : Bugs#17400: delete & update of rows in table without pk fails

rpl_ndb_2myisam         : Bugs#17400: delete & update of rows in table without pk fails

rpl_ndb_auto_inc        : Bug#17086

rpl_ndb_basic           : Bug#16228 [IN REVIEW]

#rpl_ndb_basic           : Bug#16228 [IN REVIEW]

rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_innodb2ndb      : Bugs#17400: delete & update of rows in table without pk fails

mysql-test/t/ndb_partition_error.test

+13 −0
Original line number Diff line number Diff line
@@ -56,3 +56,16 @@ INSERT INTO t1 VALUES (2); 
--error ER_NO_PARTITION_FOR_GIVEN_VALUE

UPDATE t1 SET id=5 WHERE id=2;

DROP TABLE t1;



#

# NULL for LIST partition

#

create table t1 (a int,b int, c int)

engine = ndb

partition by list(a)

partitions 2

(partition x123 values in (11, 12),

 partition x234 values in (5, 1));

--error 1504

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

drop table t1;