Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new (db37c0d6) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_basic.result

+0 −7

Original line number	Diff line number	Diff line
		@@ -6,13 +6,6 @@ attr1 INT NOT NULL,
		attr2 INT,
		attr3 VARCHAR(10)
		) ENGINE=ndbcluster;
		drop table t1;
		CREATE TABLE t1 (
		pk1 INT NOT NULL PRIMARY KEY,
		attr1 INT NOT NULL,
		attr2 INT,
		attr3 VARCHAR(10)
		) ENGINE=ndbcluster;
		SHOW INDEX FROM t1;
		Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
		t1 0 PRIMARY 1 pk1 A 0 NULL NULL BTREE

+25 −0

Original line number	Diff line number	Diff line
		@@ -122,3 +122,28 @@ select * from t1 order by nid;
		nid nom prenom
		1 DEAD ABC1
		DROP TABLE t1;
		CREATE TABLE t1 (c1 INT KEY) ENGINE=NDB;
		INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
		ALTER TABLE t1 ADD c2 INT;
		SELECT * FROM t1 ORDER BY c1;
		c1 c2
		1 NULL
		2 NULL
		3 NULL
		4 NULL
		5 NULL
		6 NULL
		7 NULL
		8 NULL
		9 NULL
		10 NULL
		ALTER TABLE t1 CHANGE c2 c2 TEXT CHARACTER SET utf8;
		ALTER TABLE t1 CHANGE c2 c2 BLOB;
		SELECT * FROM t1 ORDER BY c1 LIMIT 5;
		c1 c2
		1 NULL
		2 NULL
		3 NULL
		4 NULL
		5 NULL
		DROP TABLE t1;

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,9 +25,9 @@ rpl_ndb_2innodb : BUG#19004 2006-03-22 tomas ndb: partition by range an
		rpl_ndb_2myisam : BUG#19004 2006-03-22 tomas ndb: partition by range and update hangs
		rpl_ndb_auto_inc : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er
		rpl_ndb_ddl : result file needs update + test needs to checked
		rpl_ndb_innodb2ndb : BUG#18094 2006-03-16 mats Slave caches invalid table definition after atlters causes select failure
		rpl_ndb_innodb2ndb : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.
		rpl_ndb_log : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ
		rpl_ndb_myisam2ndb : BUG#18094 2006-03-16 mats Slave caches invalid table definition after atlters causes select failure
		rpl_ndb_myisam2ndb : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.
		rpl_ndb_relay_space : BUG#16993 2006-02-16 jmiller RBR: ALTER TABLE ZEROFILL AUTO_INCREMENT is not replicated correctly
		rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
		rpl_row_basic_7ndb : BUG#17400 2006-04-09 brian Cluster Replication: delete & update of rows in table without pk fails on slave.

+0 −11

Original line number	Diff line number	Diff line
		@@ -6,17 +6,6 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
		drop database if exists mysqltest;
		--enable_warnings

		# workaround for bug#16445
		# remove to reproduce bug and run tests drom ndb start
		# and with ndb_autodiscover disabled
		CREATE TABLE t1 (
		pk1 INT NOT NULL PRIMARY KEY,
		attr1 INT NOT NULL,
		attr2 INT,
		attr3 VARCHAR(10)
		) ENGINE=ndbcluster;
		drop table t1;

		#
		# Basic test to show that the NDB
		# table handler is working

+31 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,37 @@ COMMIT;
		--connection slave
		select * from t1 order by nid;

		# cleanup
		--connection master
		DROP TABLE t1;


		#
		# BUG#18094
		# Slave caches invalid table definition after atlters causes select failure
		#
		--connection master
		CREATE TABLE t1 (c1 INT KEY) ENGINE=NDB;

		INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

		ALTER TABLE t1 ADD c2 INT;

		--sync_slave_with_master
		connection slave;
		SELECT * FROM t1 ORDER BY c1;

		connection master;
		ALTER TABLE t1 CHANGE c2 c2 TEXT CHARACTER SET utf8;
		ALTER TABLE t1 CHANGE c2 c2 BLOB;

		--sync_slave_with_master
		connection slave;
		# here we would get error 1412 prior to bug
		SELECT * FROM t1 ORDER BY c1 LIMIT 5;



		# cleanup
		--connection master
		DROP TABLE t1;