diff options
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/ndb_alter_table3.result (renamed from mysql-test/r/ndb_alter_table_row.result) | 0 | ||||
-rw-r--r-- | mysql-test/r/ndb_alter_table_stm.result | 29 | ||||
-rw-r--r-- | mysql-test/t/ndb_alter_table3.test (renamed from mysql-test/t/ndb_alter_table_row.test) | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_alter_table_stm.test | 55 |
4 files changed, 0 insertions, 85 deletions
diff --git a/mysql-test/r/ndb_alter_table_row.result b/mysql-test/r/ndb_alter_table3.result index ee7c9b1c7b0..ee7c9b1c7b0 100644 --- a/mysql-test/r/ndb_alter_table_row.result +++ b/mysql-test/r/ndb_alter_table3.result diff --git a/mysql-test/r/ndb_alter_table_stm.result b/mysql-test/r/ndb_alter_table_stm.result deleted file mode 100644 index 7cb7b990e2c..00000000000 --- a/mysql-test/r/ndb_alter_table_stm.result +++ /dev/null @@ -1,29 +0,0 @@ -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'; -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 diff --git a/mysql-test/t/ndb_alter_table_row.test b/mysql-test/t/ndb_alter_table3.test index 9c834e0dd20..a5fe613adcf 100644 --- a/mysql-test/t/ndb_alter_table_row.test +++ b/mysql-test/t/ndb_alter_table3.test @@ -1,7 +1,6 @@ -- 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; diff --git a/mysql-test/t/ndb_alter_table_stm.test b/mysql-test/t/ndb_alter_table_stm.test deleted file mode 100644 index bf162dd0d50..00000000000 --- a/mysql-test/t/ndb_alter_table_stm.test +++ /dev/null @@ -1,55 +0,0 @@ --- 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; - ---disable_result_log ---error 0,1412 -select * from t1 where c = 'two'; ---enable_result_log - -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; - |