List:Commits« Previous MessageNext Message »
From:tomas Date:January 11 2006 11:43am
Subject:bk commit into 5.1 tree (tomas:1.2032)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2032 06/01/11 12:43:23 tomas@stripped +7 -0
  split ndb_alter_table_test in row and stm respectively

  sql/ha_ndbcluster.cc
    1.237 06/01/11 12:43:16 tomas@stripped +10 -0
    split ndb_alter_table_test in row and stm respectively

  mysql-test/t/ndb_alter_table.test
    1.31 06/01/11 12:43:16 tomas@stripped +36 -34
    split ndb_alter_table_test in row and stm respectively

  mysql-test/r/ndb_alter_table.result
    1.37 06/01/11 12:43:16 tomas@stripped +0 -25
    split ndb_alter_table_test in row and stm respectively

  mysql-test/r/ndb_alter_table_stm.result
    1.1 06/01/11 12:42:12 tomas@stripped +30 -0

  mysql-test/r/ndb_alter_table_row.result
    1.1 06/01/11 12:42:12 tomas@stripped +26 -0

  mysql-test/r/ndb_alter_table_stm.result
    1.0 06/01/11 12:42:12 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/mysql-test/r/ndb_alter_table_stm.result

  mysql-test/r/ndb_alter_table_row.result
    1.0 06/01/11 12:42:12 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/mysql-test/r/ndb_alter_table_row.result

  mysql-test/t/ndb_alter_table_stm.test
    1.1 06/01/11 12:42:05 tomas@stripped +51 -0

  mysql-test/t/ndb_alter_table_stm.test
    1.0 06/01/11 12:42:05 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/mysql-test/t/ndb_alter_table_stm.test

  mysql-test/t/ndb_alter_table_row.test
    1.1 06/01/11 12:42:04 tomas@stripped +48 -0

  mysql-test/t/ndb_alter_table_row.test
    1.0 06/01/11 12:42:04 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/mysql-test/t/ndb_alter_table_row.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6

--- 1.36/mysql-test/r/ndb_alter_table.result	2006-01-05 12:01:56 +01:00
+++ 1.37/mysql-test/r/ndb_alter_table.result	2006-01-11 12:43:16 +01:00
@@ -170,31 +170,6 @@
 4
 5
 drop table t1;
-create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
-engine=ndb;
-insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
-create index c on t1(c);
-select * from t1 where c = 'two';
-a	b	c
-2	two	two
-alter table t1 drop index c;
-select * from t1 where c = 'two';
-a	b	c
-2	two	two
-drop table t1;
-create table t3 (a int primary key) engine=ndbcluster;
-begin;
-insert into t3 values (1);
-alter table t3 rename t4;
-commit;
-select * from t3;
-ERROR 42S02: Table 'test.t3' doesn't exist
-select * from t4;
-a
-1
-drop table t4;
-show tables;
-Tables_in_test
 create table t1 (
 ai bigint auto_increment,
 c001 int(11) not null,

--- 1.30/mysql-test/t/ndb_alter_table.test	2006-01-05 12:01:56 +01:00
+++ 1.31/mysql-test/t/ndb_alter_table.test	2006-01-11 12:43:16 +01:00
@@ -142,18 +142,19 @@
 select c from t1 order by c;
 drop table t1;
 
-create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
-engine=ndb;
-insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
-create index c on t1(c); 
-connection server2;
-select * from t1 where c = 'two';
-connection server1;
-alter table t1 drop index c;
-connection server2;
-select * from t1 where c = 'two';
-connection server1;
-drop table t1;
+## Test moved to ndb_alter_table_row|stmt respectively as behaviour differs
+#create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
+#engine=ndb;
+#insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
+#create index c on t1(c); 
+#connection server2;
+#select * from t1 where c = 'two';
+#connection server1;
+#alter table t1 drop index c;
+#connection server2;
+#select * from t1 where c = 'two';
+#connection server1;
+#drop table t1;
 
 #--disable_warnings
 #DROP TABLE IF EXISTS t2;
@@ -178,31 +179,32 @@
 #select count(*) from t2;
 #drop table t2;
 
-connection server1;
-create table t3 (a int primary key) engine=ndbcluster;
+## Test moved to ndb_alter_table_row|stmt respectively as behaviour differs
+#connection server1;
+#create table t3 (a int primary key) engine=ndbcluster;
 
-connection server2;
-begin;
-insert into t3 values (1);
-
-connection server1;
-alter table t3 rename t4;
-
-connection server2;
-# with rbr the below will not work as the "alter" event
-# explicitly invalidates the dictionary cache.
-## This should work as transaction is ongoing...
-#delete from t3;
+#connection server2;
+#begin;
 #insert into t3 values (1);
-commit; 
 
-# This should fail as its a new transaction
---error 1146
-select * from t3;
-select * from t4;
-drop table t4;
-show tables;
-connection server1;
+#connection server1;
+#alter table t3 rename t4;
+
+#connection server2;
+## with rbr the below will not work as the "alter" event
+## explicitly invalidates the dictionary cache.
+### This should work as transaction is ongoing...
+##delete from t3;
+##insert into t3 values (1);
+#commit; 
+
+## This should fail as its a new transaction
+#--error 1146
+#select * from t3;
+#select * from t4;
+#drop table t4;
+#show tables;
+#connection server1;
 
 create table t1 (
 ai bigint auto_increment,

--- 1.236/sql/ha_ndbcluster.cc	2006-01-11 11:31:01 +01:00
+++ 1.237/sql/ha_ndbcluster.cc	2006-01-11 12:43:16 +01:00
@@ -5002,6 +5002,11 @@
     for (uint i= 0 ; i < list.count ; i++)
     {
       NDBDICT::List::Element& elmt= list.elements[i];
+      if (IS_TMP_PREFIX(elmt.name))
+      {
+        DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name));
+        continue;
+      }
       DBUG_PRINT("info", ("Found %s.%s in NDB", elmt.database, elmt.name));
       if (!(elmt.state == NDBOBJ::StateBuilding ||
             elmt.state == NDBOBJ::StateOnline))
@@ -5133,6 +5138,11 @@
   for (i= 0 ; i < list.count ; i++)
   {
     NDBDICT::List::Element& elmt= list.elements[i];
+    if (IS_TMP_PREFIX(elmt.name))
+    {
+      DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name));
+      continue;
+    }
     DBUG_PRINT("info", ("Found %s/%s in NDB", elmt.database, elmt.name));
 
     // Add only tables that belongs to db
--- New file ---
+++ mysql-test/r/ndb_alter_table_row.result	06/01/11 12:42:12
DROP TABLE IF EXISTS t1;
create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
engine=ndb;
insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
create index c on t1(c);
select * from t1 where c = 'two';
a	b	c
2	two	two
alter table t1 drop index c;
select * from t1 where c = 'two';
a	b	c
2	two	two
drop table t1;
create table t3 (a int primary key) engine=ndbcluster;
begin;
insert into t3 values (1);
alter table t3 rename t4;
commit;
select * from t3;
ERROR 42S02: Table 'test.t3' doesn't exist
select * from t4;
a
1
drop table t4;
show tables;
Tables_in_test

--- New file ---
+++ mysql-test/r/ndb_alter_table_stm.result	06/01/11 12:42:12
DROP TABLE IF EXISTS t1;
create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
engine=ndb;
insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
create index c on t1(c);
select * from t1 where c = 'two';
a	b	c
2	two	two
alter table t1 drop index c;
select * from t1 where c = 'two';
ERROR HY000: Can't lock file (errno: 159)
select * from t1 where c = 'two';
a	b	c
2	two	two
drop table t1;
create table t3 (a int primary key) engine=ndbcluster;
begin;
insert into t3 values (1);
alter table t3 rename t4;
delete from t3;
insert into t3 values (1);
commit;
select * from t3;
ERROR HY000: Can't lock file (errno: 155)
select * from t4;
a
1
drop table t4;
show tables;
Tables_in_test

--- New file ---
+++ mysql-test/t/ndb_alter_table_row.test	06/01/11 12:42:04
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
-- source include/have_binlog_format_row.inc

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

connection server1;
create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
engine=ndb;
insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
create index c on t1(c); 
connection server2;
select * from t1 where c = 'two';
connection server1;
alter table t1 drop index c;
connection server2;
select * from t1 where c = 'two';
connection server1;
drop table t1;

connection server1;
create table t3 (a int primary key) engine=ndbcluster;

connection server2;
begin;
insert into t3 values (1);

connection server1;
alter table t3 rename t4;

connection server2;
# with rbr the below will not work as the "alter" event
# explicitly invalidates the dictionary cache.
## This should work as transaction is ongoing...
#delete from t3;
#insert into t3 values (1);
commit; 

# This should fail as its a new transaction
--error 1146
select * from t3;
select * from t4;
drop table t4;
show tables;
connection server1;

--- New file ---
+++ mysql-test/t/ndb_alter_table_stm.test	06/01/11 12:42:05
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
-- source include/have_binlog_format_statement.inc

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

connection server1;
create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
engine=ndb;
insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
create index c on t1(c); 
connection server2;
select * from t1 where c = 'two';
connection server1;
alter table t1 drop index c;
connection server2;
-- error 1015
select * from t1 where c = 'two';
select * from t1 where c = 'two';
connection server1;
drop table t1;

connection server1;
create table t3 (a int primary key) engine=ndbcluster;

connection server2;
begin;
insert into t3 values (1);

connection server1;
alter table t3 rename t4;

connection server2;
# with rbr the below will not work as the "alter" event
# explicitly invalidates the dictionary cache.
# This should work as transaction is ongoing...
delete from t3;
insert into t3 values (1);
commit; 

# This should fail as its a new transaction
--error 1015
select * from t3;
select * from t4;
drop table t4;
show tables;
connection server1;


Thread
bk commit into 5.1 tree (tomas:1.2032)tomas11 Jan