From: Martin Skold
Date: June 16 2011 1:07pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:4449) Bug#7798
List-Archive: http://lists.mysql.com/commits/139330
X-Bug: 7798
Message-Id: <20110616130803.5F4069F8D71@quadfish>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1623257790=="

--===============1623257790==
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

 4449 Martin Skold	2011-06-16
      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-16 13:07:45 +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-16 13:07:45 +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-16 13:07:45 +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-16 13:07:45 +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;
+


--===============1623257790==
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: fe35e65480f53a5112aa54126857d63451616e62
# timestamp: 2011-06-16 15:08:03 +0200
# source_branch: bzr+ssh://mskold@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0_merge/
# base_revision_id: magnus.blaudd@stripped\
#   q22hqu71hglycbwv
# 
# Begin bundle
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
oSG/ntZ2


--===============1623257790==--