Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

9 files changed, 204 insertions, 0 deletions

diff --git a/mysql-test/t/ndb_dd_alter.test b/mysql-test/t/ndb_dd_alter.test
index 6a9bdb79f6f..ef7807e8723 100644
--- a/mysql-test/t/ndb_dd_alter.test
+++ b/mysql-test/t/ndb_dd_alter.test
@@ -221,6 +221,9 @@ ALTER TABLE test.t1 DROP INDEX a2_i;
 
 SHOW CREATE TABLE test.t1;
 
+TRUNCATE TABLE test.t1;
+
+SHOW CREATE TABLE test.t1;
 
 #### Try to ALTER DD Tables and drop columns
 
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index bba0c5ca53f..c2a96a590ca 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -455,3 +455,26 @@ rollback;
 select * from t1 order by a;
 delete from t1;
 drop table t1;
+
+# bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index
+
+--error ER_CANT_CREATE_TABLE
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+                           CountryCode char(3) NOT NULL,
+                           DishTitle varchar(64) NOT NULL,
+                           calories smallint(5) unsigned DEFAULT NULL,
+                           PRIMARY KEY (DishID),
+                           INDEX i USING HASH (countrycode,calories)
+                           ) ENGINE=ndbcluster;
+
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+                           CountryCode char(3) NOT NULL,
+                           DishTitle varchar(64) NOT NULL,
+                           calories smallint(5) unsigned DEFAULT NULL,
+                           PRIMARY KEY (DishID)
+                           ) ENGINE=ndbcluster;
+
+--error ER_UNSUPPORTED_EXTENSION
+create index i on nationaldish(countrycode,calories) using hash;
+
+drop table nationaldish;
diff --git a/mysql-test/t/ndb_partition_key.test b/mysql-test/t/ndb_partition_key.test
index d8c1b61b94f..78e2c9d15c2 100644
--- a/mysql-test/t/ndb_partition_key.test
+++ b/mysql-test/t/ndb_partition_key.test
@@ -199,3 +199,31 @@ ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
 SELECT NODEGROUP,PARTITION_NAME FROM information_schema.partitions WHERE
 table_name = "t1";
 DROP TABLE t1;
+
+# bug#25587
+
+CREATE TABLE t1 (
+a tinyint unsigned NOT NULL,
+b bigint(20) unsigned NOT NULL,
+c char(12),
+PRIMARY KEY (a,b)
+) ENGINE ndb DEFAULT CHARSET=latin1 PARTITION BY KEY (a);
+
+insert into t1 values(1,1,'1'), (2,2,'2'), (3,3,'3'), (4,4,'4'), (5,5,'5');
+select * from t1 where a = 1;
+select * from t1 where a = 2;
+select * from t1 where a = 3;
+select * from t1 where a = 4;
+select * from t1 where a = 5;
+delete from t1 where a = 1;
+select * from t1 order by 1;
+delete from t1 where a = 2;
+select * from t1 order by 1;
+delete from t1 where a = 3;
+select * from t1 order by 1;
+delete from t1 where a = 4;
+select * from t1 order by 1;
+delete from t1 where a = 5;
+select * from t1 order by 1;
+
+drop table t1;
diff --git a/mysql-test/t/rpl_ndb_do_db-slave.opt b/mysql-test/t/rpl_ndb_do_db-slave.opt
new file mode 100644
index 00000000000..fb5e378b65f
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_do_db-slave.opt
@@ -0,0 +1 @@
+--replicate-do-db=replica
diff --git a/mysql-test/t/rpl_ndb_do_db.test b/mysql-test/t/rpl_ndb_do_db.test
new file mode 100644
index 00000000000..9b65d43f244
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_do_db.test
@@ -0,0 +1,57 @@
+###########################################################
+# Author: Jeb
+# Date: 14-12-2006
+# Purpose: To test --replicate-do-database=db_name
+#          using cluster. Only replica should replicate.
+##########################################################
+
+--source include/have_ndb.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--disable_warnings
+DROP DATABASE IF EXISTS replica;
+--enable_warnings
+
+# Create database and tables for the test.
+CREATE DATABASE replica;
+CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+USE replica;
+CREATE TABLE replica.t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+CREATE TABLE replica.t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+
+# Insert data into db that should not be picked up by slave
+USE test;
+INSERT INTO t1 VALUES(1, repeat('abc',10));
+INSERT INTO t2 VALUES(1, repeat('abc',10));
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+
+# Insert data into db that should be replicated
+USE replica;
+INSERT INTO replica.t1 VALUES(2, repeat('def',200));
+INSERT INTO replica.t2 VALUES(2, repeat('def',200));
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+
+# Check results on slave
+--sync_slave_with_master
+SHOW TABLES;
+USE replica;
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+USE test;
+SHOW TABLES;
+
+# Cleanup from testing
+connection master;
+USE test;
+DROP TABLE t1, t2;
+DROP DATABASE IF EXISTS replica;
+--sync_slave_with_master
+
+# End 5.1 test case
diff --git a/mysql-test/t/rpl_ndb_do_table-slave.opt b/mysql-test/t/rpl_ndb_do_table-slave.opt
new file mode 100644
index 00000000000..da345474216
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_do_table-slave.opt
@@ -0,0 +1 @@
+--replicate-do-table=test.t1
diff --git a/mysql-test/t/rpl_ndb_do_table.test b/mysql-test/t/rpl_ndb_do_table.test
new file mode 100644
index 00000000000..278a326aefd
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_do_table.test
@@ -0,0 +1,32 @@
+###########################################################
+# Author: Jeb
+# Date: 14-12-2006
+# Purpose: To test --replicate-do-table=db_name.tbl_name
+#          using cluster. Only t1 should replicate.
+##########################################################
+
+--source include/have_ndb.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+
+INSERT INTO t1 VALUES(1, repeat('abc',10));
+INSERT INTO t1 VALUES(2, repeat('def',200));
+INSERT INTO t1 VALUES(3, repeat('ghi',3000));
+INSERT INTO t2 VALUES(1, repeat('abc',10));
+INSERT INTO t2 VALUES(2, repeat('def',200));
+INSERT INTO t2 VALUES(3, repeat('ghi',3000));
+
+--sync_slave_with_master
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+
+connection master;
+DROP TABLE IF EXISTS t1, t2;
+--sync_slave_with_master
diff --git a/mysql-test/t/rpl_ndb_rep_ignore-slave.opt b/mysql-test/t/rpl_ndb_rep_ignore-slave.opt
new file mode 100644
index 00000000000..6262cf451a6
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_rep_ignore-slave.opt
@@ -0,0 +1 @@
+--replicate-ignore-db=test --replicate-ignore-table=replica.t1
diff --git a/mysql-test/t/rpl_ndb_rep_ignore.test b/mysql-test/t/rpl_ndb_rep_ignore.test
new file mode 100644
index 00000000000..47f5bce5527
--- /dev/null
+++ b/mysql-test/t/rpl_ndb_rep_ignore.test
@@ -0,0 +1,58 @@
+###########################################################
+# Author: Jeb
+# Date: 15-12-2006
+# Purpose: To test --replicate-ignore-table=db_name.tbl_name
+#          and --replicate-ignore-db=db_name
+#          using cluster. Only replica should replicate.
+##########################################################
+
+--source include/have_ndb.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--disable_warnings
+DROP DATABASE IF EXISTS replica;
+--enable_warnings
+
+# Create database and tables for the test.
+CREATE DATABASE replica;
+CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+USE replica;
+CREATE TABLE replica.t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+CREATE TABLE replica.t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
+
+# Insert data into db that should not be picked up by slave
+USE test;
+INSERT INTO t1 VALUES(1, repeat('abc',10));
+INSERT INTO t2 VALUES(1, repeat('abc',10));
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+
+# Insert data into db that should be replicated
+USE replica;
+INSERT INTO replica.t1 VALUES(2, repeat('def',200));
+INSERT INTO replica.t2 VALUES(2, repeat('def',200));
+SHOW TABLES;
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+
+# Check results on slave
+--sync_slave_with_master
+SHOW TABLES;
+USE replica;
+SHOW TABLES;
+#SELECT COUNT(*) FROM t1;
+SELECT COUNT(*) FROM t2;
+USE test;
+SHOW TABLES;
+
+# Cleanup from testing
+connection master;
+USE test;
+DROP TABLE t1, t2;
+DROP DATABASE IF EXISTS replica;
+--sync_slave_with_master
+
+# End 5.1 test case