From: Martin Skold Date: June 8 2011 1:18pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:4446) Bug#7798 List-Archive: http://lists.mysql.com/commits/138847 X-Bug: 7798 Message-Id: <20110608131818.564919F8D71@quadfish> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1173354650==" --===============1173354650== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/marty/MySQL/mysql-5.1-telco-7.0/ based on revid:magnus.blaudd@stripped 4446 Martin Skold 2011-06-08 Bug#7798 Running range scan after alter table in different thread causes node failure: Fixed test case and moved it to ndb_multi modified: mysql-test/suite/ndb/r/ndb_index_ordered.result mysql-test/suite/ndb/r/ndb_multi.result mysql-test/suite/ndb/t/ndb_index_ordered.test mysql-test/suite/ndb/t/ndb_multi.test === modified file 'mysql-test/suite/ndb/r/ndb_index_ordered.result' --- a/mysql-test/suite/ndb/r/ndb_index_ordered.result 2010-10-20 17:39:53 +0000 +++ b/mysql-test/suite/ndb/r/ndb_index_ordered.result 2011-06-08 13:18:02 +0000 @@ -637,21 +637,6 @@ select count(*)- 4 from t1 use index (v) count(*)- 4 0 drop table t1; -create table t1(a int primary key, b int not null, index(b)); -insert into t1 values (1,1), (2,2); -set autocommit=0; -begin; -select count(*) from t1; -count(*) -2 -ALTER TABLE t1 ADD COLUMN c int; -select a from t1 where b = 2; -a -2 -show tables; -Tables_in_test -t1 -drop table t1; create table t1 (a int, c varchar(10), primary key using hash (a), index(c)) engine=ndb; insert into t1 (a, c) values (1,'aaa'),(3,'bbb'); === modified file 'mysql-test/suite/ndb/r/ndb_multi.result' --- a/mysql-test/suite/ndb/r/ndb_multi.result 2011-03-22 08:32:32 +0000 +++ b/mysql-test/suite/ndb/r/ndb_multi.result 2011-06-08 13:18:02 +0000 @@ -196,3 +196,19 @@ insert into t1 values(37); alter table t1 engine ndb; truncate t1; drop table t1; +create table t1(a int primary key, b int not null, index(b)) engine = ndb; +insert into t1 values (1,1), (2,2); +set autocommit=0; +begin; +select count(*) from t1; +count(*) +2 +ALTER OFFLINE TABLE t1 ADD COLUMN c int; +select a from t1 where b = 2; +a +2 +commit; +show tables; +Tables_in_test +t1 +drop table t1; === modified file 'mysql-test/suite/ndb/t/ndb_index_ordered.test' --- a/mysql-test/suite/ndb/t/ndb_index_ordered.test 2010-10-20 17:39:53 +0000 +++ b/mysql-test/suite/ndb/t/ndb_index_ordered.test 2011-06-08 13:18:02 +0000 @@ -332,22 +332,6 @@ select count(*)- 4 from t1 use index (v) drop table t1; -# bug#7798 -create table t1(a int primary key, b int not null, index(b)); -insert into t1 values (1,1), (2,2); -connect (con1,localhost,root,,test); -connect (con2,localhost,root,,test); -connection con1; -set autocommit=0; -begin; -select count(*) from t1; -connection con2; -ALTER TABLE t1 ADD COLUMN c int; -connection con1; -select a from t1 where b = 2; -show tables; -drop table t1; - # mysqld 5.0.13 crash, no bug# create table t1 (a int, c varchar(10), primary key using hash (a), index(c)) engine=ndb; === modified file 'mysql-test/suite/ndb/t/ndb_multi.test' --- a/mysql-test/suite/ndb/t/ndb_multi.test 2011-03-22 08:32:32 +0000 +++ b/mysql-test/suite/ndb/t/ndb_multi.test 2011-06-08 13:18:02 +0000 @@ -246,3 +246,18 @@ truncate t1; # Cleanup drop table t1; connection server1; + +# bug#7798 +create table t1(a int primary key, b int not null, index(b)) engine = ndb; +insert into t1 values (1,1), (2,2); +set autocommit=0; +begin; +select count(*) from t1; +connection server2; +ALTER OFFLINE TABLE t1 ADD COLUMN c int; +connection server1; +select a from t1 where b = 2; +commit; +show tables; +drop table t1; + --===============1173354650== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.skold@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.skold@stripped # target_branch: file:///home/marty/MySQL/mysql-5.1-telco-7.0/ # testament_sha1: 1bc0f6f7ce55c171b91553af14086cb4b49cae5c # timestamp: 2011-06-08 15:18:18 +0200 # source_branch: bzr+ssh://mskold@stripped/bzrroot\ # /server/mysql-5.1-telco-7.0_merge/ # base_revision_id: magnus.blaudd@stripped\ # oelbpd2iaozj2204 # # Begin bundle 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 NyEyRNJSc/xdyRThQkAz+tfo --===============1173354650==--