MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:March 1 2006 12:31pm
Subject:bk commit into 5.1 tree (tomas:1.2213) BUG#17805
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.2213 06/03/01 13:31:21 tomas@stripped +32 -0
  Bug #17805  	Cluster_replication database should be renamed to just cluster

  sql/ha_ndbcluster_tables.h
    1.2 06/03/01 13:31:14 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  sql/ha_ndbcluster_binlog.cc
    1.29 06/03/01 13:31:13 tomas@stripped +11 -11
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  scripts/mysql_create_system_tables.sh
    1.38 06/03/01 13:31:13 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/rpl_ndb_sync.test
    1.7 06/03/01 13:31:13 tomas@stripped +10 -10
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/rpl_ndb_multi.test
    1.2 06/03/01 13:31:13 tomas@stripped +3 -3
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/rpl_ndb_idempotent.test
    1.3 06/03/01 13:31:13 tomas@stripped +3 -3
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/rpl_ndb_bank.test
    1.5 06/03/01 13:31:13 tomas@stripped +6 -6
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/ndb_binlog_multi.test
    1.2 06/03/01 13:31:13 tomas@stripped +6 -6
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/t/ndb_binlog_basic.test
    1.2 06/03/01 13:31:13 tomas@stripped +9 -9
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/show_check.result
    1.92 06/03/01 13:31:13 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/schema.result
    1.5 06/03/01 13:31:13 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_row_basic_11bugs.result
    1.5 06/03/01 13:31:13 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_sync.result
    1.6 06/03/01 13:31:13 tomas@stripped +9 -9
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_multi.result
    1.2 06/03/01 13:31:13 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_log.result
    1.5 06/03/01 13:31:13 tomas@stripped +9 -9
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_idempotent.result
    1.3 06/03/01 13:31:13 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_dd_basic.result
    1.4 06/03/01 13:31:13 tomas@stripped +5 -5
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_blob.result
    1.2 06/03/01 13:31:13 tomas@stripped +32 -32
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_ndb_bank.result
    1.3 06/03/01 13:31:13 tomas@stripped +6 -6
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_loaddata_m.result
    1.22 06/03/01 13:31:13 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_load_from_master.result
    1.28 06/03/01 13:31:13 tomas@stripped +3 -3
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/rpl_create_database.result
    1.9 06/03/01 13:31:13 tomas@stripped +4 -4
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/ps_1general.result
    1.56 06/03/01 13:31:13 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/ndb_binlog_multi.result
    1.2 06/03/01 13:31:13 tomas@stripped +5 -5
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.6 06/03/01 13:31:12 tomas@stripped +4 -4
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/ndb_binlog_basic.result
    1.2 06/03/01 13:31:12 tomas@stripped +9 -9
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/mysqlcheck.result
    1.7 06/03/01 13:31:12 tomas@stripped +1 -1
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/information_schema.result
    1.109 06/03/01 13:31:12 tomas@stripped +4 -4
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/r/drop.result
    1.30 06/03/01 13:31:12 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/mysql-test-run.sh
    1.306 06/03/01 13:31:12 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/mysql-test-run.pl
    1.76 06/03/01 13:31:12 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

  mysql-test/lib/init_db.sql
    1.25 06/03/01 13:31:12 tomas@stripped +2 -2
    Bug #17805  	Cluster_replication database should be renamed to just cluster

# 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-new

--- 1.305/mysql-test/mysql-test-run.sh	2006-02-28 22:14:25 +01:00
+++ 1.306/mysql-test/mysql-test-run.sh	2006-03-01 13:31:12 +01:00
@@ -1326,8 +1326,8 @@
 
 rm_ndbcluster_tables()
 {
-  $RM -f $1/cluster_replication/apply_status*
-  $RM -f $1/cluster_replication/schema*
+  $RM -f $1/cluster/apply_status*
+  $RM -f $1/cluster/schema*
 }
 
 stop_ndbcluster()

--- 1.4/mysql-test/r/schema.result	2006-01-12 19:50:30 +01:00
+++ 1.5/mysql-test/r/schema.result	2006-03-01 13:31:13 +01:00
@@ -6,7 +6,7 @@
 show schemas;
 Database
 information_schema
-cluster_replication
+cluster
 foo
 mysql
 test

--- 1.108/mysql-test/r/information_schema.result	2006-02-17 20:06:00 +01:00
+++ 1.109/mysql-test/r/information_schema.result	2006-03-01 13:31:12 +01:00
@@ -14,7 +14,7 @@
 select schema_name from information_schema.schemata;
 schema_name
 information_schema
-cluster_replication
+cluster
 mysql
 test
 show databases like 't%';
@@ -23,7 +23,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 show databases where `database` = 't%';
@@ -339,7 +339,7 @@
 select * from v0;
 c
 information_schema
-cluster_replication
+cluster
 mysql
 test
 explain select * from v0;
@@ -835,7 +835,7 @@
 flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-cluster_replication	1
+cluster	1
 information_schema	22
 mysql	21
 create table t1 (i int, j int);

--- 1.6/mysql-test/r/mysqlcheck.result	2006-02-24 22:20:42 +01:00
+++ 1.7/mysql-test/r/mysqlcheck.result	2006-03-01 13:31:12 +01:00
@@ -1,6 +1,6 @@
 DROP SCHEMA test;
 CREATE SCHEMA test;
-cluster_replication.binlog_index                   OK
+cluster.binlog_index                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK

--- 1.55/mysql-test/r/ps_1general.result	2006-02-07 17:56:22 +01:00
+++ 1.56/mysql-test/r/ps_1general.result	2006-03-01 13:31:13 +01:00
@@ -259,7 +259,7 @@
 execute stmt4;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 prepare stmt4 from ' show tables from test like ''t2%'' ';

--- 1.21/mysql-test/r/rpl_loaddata_m.result	2006-02-22 10:07:29 +01:00
+++ 1.22/mysql-test/r/rpl_loaddata_m.result	2006-03-01 13:31:13 +01:00
@@ -21,7 +21,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest
 test

--- 1.4/mysql-test/r/rpl_ndb_log.result	2006-02-16 21:49:47 +01:00
+++ 1.5/mysql-test/r/rpl_ndb_log.result	2006-03-01 13:31:13 +01:00
@@ -21,7 +21,7 @@
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
 master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	1	#	cluster.apply_status
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
@@ -29,7 +29,7 @@
 master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
 master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	1	#	cluster.apply_status
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
@@ -43,7 +43,7 @@
 master-bin.000001	#	Query	1	#	BEGIN
 show binlog events from 102 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	1	#	cluster.apply_status
 flush logs;
 create table t3 (a int)ENGINE=NDB;
 start slave;
@@ -56,7 +56,7 @@
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
 master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	1	#	cluster.apply_status
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
@@ -64,7 +64,7 @@
 master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
 master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	1	#	cluster.apply_status
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
@@ -76,7 +76,7 @@
 master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
 master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
 master-bin.000002	#	Query	1	#	BEGIN
-master-bin.000002	#	Table_map	1	#	cluster_replication.apply_status
+master-bin.000002	#	Table_map	1	#	cluster.apply_status
 master-bin.000002	#	Write_rows	1	#	
 master-bin.000002	#	Table_map	1	#	test.t2
 master-bin.000002	#	Write_rows	1	#	
@@ -95,7 +95,7 @@
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
 slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
 slave-bin.000001	#	Query	2	#	BEGIN
-slave-bin.000001	#	Table_map	2	#	cluster_replication.apply_status
+slave-bin.000001	#	Table_map	2	#	cluster.apply_status
 slave-bin.000001	#	Write_rows	2	#	
 slave-bin.000001	#	Table_map	2	#	test.t1
 slave-bin.000001	#	Write_rows	2	#	
@@ -104,7 +104,7 @@
 slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
 slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
 slave-bin.000001	#	Query	2	#	BEGIN
-slave-bin.000001	#	Table_map	2	#	cluster_replication.apply_status
+slave-bin.000001	#	Table_map	2	#	cluster.apply_status
 slave-bin.000001	#	Write_rows	2	#	
 slave-bin.000001	#	Table_map	2	#	test.t1
 slave-bin.000001	#	Write_rows	2	#	
@@ -115,7 +115,7 @@
 slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
 slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
 slave-bin.000002	#	Query	2	#	BEGIN
-slave-bin.000002	#	Table_map	2	#	cluster_replication.apply_status
+slave-bin.000002	#	Table_map	2	#	cluster.apply_status
 slave-bin.000002	#	Write_rows	2	#	
 slave-bin.000002	#	Table_map	2	#	test.t2
 slave-bin.000002	#	Write_rows	2	#	

--- 1.24/mysql-test/lib/init_db.sql	2006-02-01 19:27:04 +01:00
+++ 1.25/mysql-test/lib/init_db.sql	2006-03-01 13:31:12 +01:00
@@ -634,5 +634,5 @@
   PRIMARY KEY  (definer, db, name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
 
-CREATE DATABASE IF NOT EXISTS cluster_replication;
-CREATE TABLE IF NOT EXISTS cluster_replication.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
+CREATE DATABASE IF NOT EXISTS cluster;
+CREATE TABLE IF NOT EXISTS cluster.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;

--- 1.75/mysql-test/mysql-test-run.pl	2006-02-27 16:58:31 +01:00
+++ 1.76/mysql-test/mysql-test-run.pl	2006-03-01 13:31:12 +01:00
@@ -1508,8 +1508,8 @@
 
 sub rm_ndbcluster_tables ($) {
   my $dir=       shift;
-  foreach my $bin ( glob("$dir/cluster_replication/apply_status*"),
-                    glob("$dir/cluster_replication/schema*") )
+  foreach my $bin ( glob("$dir/cluster/apply_status*"),
+                    glob("$dir/cluster/schema*") )
   {
     unlink($bin);
   }

--- 1.8/mysql-test/r/rpl_create_database.result	2006-02-03 19:02:15 +01:00
+++ 1.9/mysql-test/r/rpl_create_database.result	2006-03-01 13:31:13 +01:00
@@ -23,7 +23,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest_bob
 mysqltest_prometheus
@@ -32,7 +32,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest_prometheus
 mysqltest_sisyfos
@@ -47,7 +47,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest_bob
 mysqltest_prometheus
@@ -56,7 +56,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest_prometheus
 mysqltest_sisyfos

--- 1.4/mysql-test/r/rpl_row_basic_11bugs.result	2006-02-15 22:59:42 +01:00
+++ 1.5/mysql-test/r/rpl_row_basic_11bugs.result	2006-03-01 13:31:13 +01:00
@@ -9,7 +9,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 test_ignore
@@ -29,7 +29,7 @@
 SHOW DATABASES;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 USE test;

--- 1.91/mysql-test/r/show_check.result	2006-02-17 20:06:00 +01:00
+++ 1.92/mysql-test/r/show_check.result	2006-03-01 13:31:13 +01:00
@@ -53,7 +53,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 show databases like "test%";

--- 1.1/mysql-test/r/rpl_ndb_blob.result	2006-02-05 18:53:58 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_blob.result	2006-03-01 13:31:13 +01:00
@@ -86,41 +86,41 @@
 b text not null
 ) engine=ndb
 master-bin.000001	239	Query	1	303	BEGIN
-master-bin.000001	303	Table_map	1	65	cluster_replication.apply_status
-master-bin.000001	368	Write_rows	1	107	
-master-bin.000001	410	Table_map	1	147	test.t1
-master-bin.000001	450	Write_rows	1	818	
-master-bin.000001	1121	Write_rows	1	9853	
-master-bin.000001	10156	Query	1	10221	COMMIT
-master-bin.000001	10221	Query	1	10285	BEGIN
-master-bin.000001	10285	Table_map	1	65	cluster_replication.apply_status
-master-bin.000001	10350	Write_rows	1	107	
-master-bin.000001	10392	Query	1	10457	COMMIT
-master-bin.000001	10457	Query	1	10533	use `test`; drop table t1
-master-bin.000001	10533	Query	1	10708	use `test`; create table t1 (
+master-bin.000001	303	Table_map	1	53	cluster.apply_status
+master-bin.000001	356	Write_rows	1	95	
+master-bin.000001	398	Table_map	1	135	test.t1
+master-bin.000001	438	Write_rows	1	806	
+master-bin.000001	1109	Write_rows	1	9841	
+master-bin.000001	10144	Query	1	10209	COMMIT
+master-bin.000001	10209	Query	1	10273	BEGIN
+master-bin.000001	10273	Table_map	1	53	cluster.apply_status
+master-bin.000001	10326	Write_rows	1	95	
+master-bin.000001	10368	Query	1	10433	COMMIT
+master-bin.000001	10433	Query	1	10509	use `test`; drop table t1
+master-bin.000001	10509	Query	1	10684	use `test`; create table t1 (
 a int not null primary key,
 b text not null,
 c int,
 d longblob,
 e tinyblob
 ) engine=ndbcluster
-master-bin.000001	10708	Query	1	10772	BEGIN
-master-bin.000001	10772	Table_map	1	65	cluster_replication.apply_status
-master-bin.000001	10837	Write_rows	1	107	
-master-bin.000001	10879	Table_map	1	150	test.t1
-master-bin.000001	10922	Write_rows	1	48934	
-master-bin.000001	59706	Write_rows	1	124436	
-master-bin.000001	135208	Write_rows	1	124542	
-master-bin.000001	135314	Write_rows	1	205961	
-master-bin.000001	216733	Write_rows	1	224245	
-master-bin.000001	235017	Write_rows	1	227523	
-master-bin.000001	238295	Write_rows	1	242391	
-master-bin.000001	253163	Write_rows	1	254087	
-master-bin.000001	264859	Write_rows	1	304335	
-master-bin.000001	315107	Write_rows	1	330427	
-master-bin.000001	341199	Query	1	341264	COMMIT
-master-bin.000001	341264	Query	1	341328	BEGIN
-master-bin.000001	341328	Table_map	1	65	cluster_replication.apply_status
-master-bin.000001	341393	Write_rows	1	107	
-master-bin.000001	341435	Query	1	341500	COMMIT
-master-bin.000001	341500	Query	1	341576	use `test`; drop table t1
+master-bin.000001	10684	Query	1	10748	BEGIN
+master-bin.000001	10748	Table_map	1	53	cluster.apply_status
+master-bin.000001	10801	Write_rows	1	95	
+master-bin.000001	10843	Table_map	1	138	test.t1
+master-bin.000001	10886	Write_rows	1	48922	
+master-bin.000001	59670	Write_rows	1	124424	
+master-bin.000001	135172	Write_rows	1	124530	
+master-bin.000001	135278	Write_rows	1	205949	
+master-bin.000001	216697	Write_rows	1	224233	
+master-bin.000001	234981	Write_rows	1	227511	
+master-bin.000001	238259	Write_rows	1	242379	
+master-bin.000001	253127	Write_rows	1	254075	
+master-bin.000001	264823	Write_rows	1	304323	
+master-bin.000001	315071	Write_rows	1	330415	
+master-bin.000001	341163	Query	1	341228	COMMIT
+master-bin.000001	341228	Query	1	341292	BEGIN
+master-bin.000001	341292	Table_map	1	53	cluster.apply_status
+master-bin.000001	341345	Write_rows	1	95	
+master-bin.000001	341387	Query	1	341452	COMMIT
+master-bin.000001	341452	Query	1	341528	use `test`; drop table t1

--- 1.27/mysql-test/r/rpl_load_from_master.result	2006-02-03 15:06:36 +01:00
+++ 1.28/mysql-test/r/rpl_load_from_master.result	2006-03-01 13:31:13 +01:00
@@ -33,7 +33,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest
 mysqltest2
@@ -51,7 +51,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 create database mysqltest2;
@@ -71,7 +71,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest
 mysqltest2

--- 1.29/mysql-test/r/drop.result	2006-01-12 19:50:29 +01:00
+++ 1.30/mysql-test/r/drop.result	2006-03-01 13:31:12 +01:00
@@ -47,7 +47,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 mysqltest
 test
@@ -59,7 +59,7 @@
 show databases;
 Database
 information_schema
-cluster_replication
+cluster
 mysql
 test
 drop database mysqltest;

--- 1.1/mysql-test/r/ndb_binlog_basic.result	2006-01-12 19:50:38 +01:00
+++ 1.2/mysql-test/r/ndb_binlog_basic.result	2006-03-01 13:31:12 +01:00
@@ -6,7 +6,7 @@
 use test;
 create table t1 (a int primary key) engine=ndb;
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-select @max_epoch:=max(epoch)-1 from cluster_replication.binlog_index;
+select @max_epoch:=max(epoch)-1 from cluster.binlog_index;
 @max_epoch:=max(epoch)-1
 #
 delete from t1;
@@ -19,25 +19,25 @@
 delete from t2 where a=4;
 commit;
 drop table t2;
-select inserts from cluster_replication.binlog_index where epoch > @max_epoch and inserts > 5;
+select inserts from cluster.binlog_index where epoch > @max_epoch and inserts > 5;
 inserts
 10
-select deletes from cluster_replication.binlog_index where epoch > @max_epoch and deletes > 5;
+select deletes from cluster.binlog_index where epoch > @max_epoch and deletes > 5;
 deletes
 10
 select inserts,updates,deletes from 
-cluster_replication.binlog_index where epoch > @max_epoch and updates > 0;
+cluster.binlog_index where epoch > @max_epoch and updates > 0;
 inserts	updates	deletes
 2	1	1
 select schemaops from 
-cluster_replication.binlog_index where epoch > @max_epoch and schemaops > 0;
+cluster.binlog_index where epoch > @max_epoch and schemaops > 0;
 schemaops
 1
 1
 1
 flush logs;
 purge master logs before now();
-select count(*) from cluster_replication.binlog_index;
+select count(*) from cluster.binlog_index;
 count(*)
 0
 create table t1 (a int primary key, b int) engine=ndb;
@@ -46,17 +46,17 @@
 create table t1 (c int, d int primary key) engine=ndb;
 use test;
 insert into mysqltest.t1 values (2,1),(2,2);
-select @max_epoch:=max(epoch)-1 from cluster_replication.binlog_index;
+select @max_epoch:=max(epoch)-1 from cluster.binlog_index;
 @max_epoch:=max(epoch)-1
 #
 drop table t1;
 drop database mysqltest;
 select inserts,updates,deletes from 
-cluster_replication.binlog_index where epoch > @max_epoch and inserts > 0;
+cluster.binlog_index where epoch > @max_epoch and inserts > 0;
 inserts	updates	deletes
 2	0	0
 select schemaops from
-cluster_replication.binlog_index where epoch > @max_epoch and schemaops > 0;
+cluster.binlog_index where epoch > @max_epoch and schemaops > 0;
 schemaops
 1
 1

--- 1.5/mysql-test/r/ndb_binlog_ddl_multi.result	2006-02-07 19:02:30 +01:00
+++ 1.6/mysql-test/r/ndb_binlog_ddl_multi.result	2006-03-01 13:31:12 +01:00
@@ -24,7 +24,7 @@
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin1.000001	#	Query	#	#	BEGIN
-master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
+master-bin1.000001	#	Table_map	#	#	cluster.apply_status
 master-bin1.000001	#	Write_rows	#	#	
 master-bin1.000001	#	Query	#	#	COMMIT
 master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)
@@ -36,7 +36,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	cluster_replication.apply_status
+master-bin.000001	#	Table_map	#	#	cluster.apply_status
 master-bin.000001	#	Write_rows	#	#	
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`
@@ -49,7 +49,7 @@
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin1.000001	#	Query	#	#	BEGIN
-master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
+master-bin1.000001	#	Table_map	#	#	cluster.apply_status
 master-bin1.000001	#	Write_rows	#	#	
 master-bin1.000001	#	Table_map	#	#	test.t2
 master-bin1.000001	#	Write_rows	#	#	
@@ -119,7 +119,7 @@
 master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 
 ENGINE =NDB
 master-bin1.000001	#	Query	#	#	BEGIN
-master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
+master-bin1.000001	#	Table_map	#	#	cluster.apply_status
 master-bin1.000001	#	Write_rows	#	#	
 master-bin1.000001	#	Query	#	#	COMMIT
 master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`

--- 1.1/mysql-test/r/ndb_binlog_multi.result	2006-01-12 19:50:38 +01:00
+++ 1.2/mysql-test/r/ndb_binlog_multi.result	2006-03-01 13:31:13 +01:00
@@ -12,7 +12,7 @@
 1	1
 2	2
 SELECT @the_epoch:=epoch,inserts,updates,deletes,schemaops FROM 
-cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1;
+cluster.binlog_index ORDER BY epoch DESC LIMIT 1;
 @the_epoch:=epoch	inserts	updates	deletes	schemaops
 <the_epoch>	2	0	0	0
 SELECT * FROM t2 ORDER BY a;
@@ -20,24 +20,24 @@
 1	1
 2	2
 SELECT inserts,updates,deletes,schemaops FROM 
-cluster_replication.binlog_index WHERE epoch=<the_epoch>;
+cluster.binlog_index WHERE epoch=<the_epoch>;
 inserts	updates	deletes	schemaops
 2	0	0	0
 DROP TABLE t2;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB;
 INSERT INTO t1 VALUES (1),(2);
 SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM 
-cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1;
+cluster.binlog_index ORDER BY epoch DESC LIMIT 1;
 @the_epoch2:=epoch	inserts	updates	deletes	schemaops
 <the_epoch2>	2	0	0	0
 SELECT inserts,updates,deletes,schemaops FROM
-cluster_replication.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
+cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
 inserts	updates	deletes	schemaops
 0	0	0	1
 drop table t1;
 SHOW TABLES;
 Tables_in_test
 SELECT inserts,updates,deletes,schemaops FROM
-cluster_replication.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
+cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
 inserts	updates	deletes	schemaops
 0	0	0	1

--- 1.2/mysql-test/r/rpl_ndb_bank.result	2006-02-22 10:07:31 +01:00
+++ 1.3/mysql-test/r/rpl_ndb_bank.result	2006-03-01 13:31:13 +01:00
@@ -47,17 +47,17 @@
 DROP DATABASE BANK;
 CREATE DATABASE BANK;
 RESET MASTER;
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
-DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
-SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
+CREATE TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+DELETE FROM cluster.backup_info;
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ',';
+SELECT @the_backup_id:=backup_id FROM cluster.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 @the_epoch:=MAX(epoch)
 <the_epoch>
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM cluster_replication.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
+FROM cluster.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 <the_pos>	master-bin.000001
 CHANGE MASTER TO

--- 1.3/mysql-test/r/rpl_ndb_dd_basic.result	2006-02-09 22:10:47 +01:00
+++ 1.4/mysql-test/r/rpl_ndb_dd_basic.result	2006-03-01 13:31:13 +01:00
@@ -57,11 +57,11 @@
 tablespace ts1 storage disk
 engine ndb
 master-bin.000001	978	Query	1	1042	BEGIN
-master-bin.000001	1042	Table_map	1	65	cluster_replication.apply_status
-master-bin.000001	1107	Write_rows	1	107	
-master-bin.000001	1149	Table_map	1	148	test.t1
-master-bin.000001	1190	Write_rows	1	190	
-master-bin.000001	1232	Query	1	1297	COMMIT
+master-bin.000001	1042	Table_map	1	53	cluster.apply_status
+master-bin.000001	1095	Write_rows	1	95	
+master-bin.000001	1137	Table_map	1	136	test.t1
+master-bin.000001	1178	Write_rows	1	178	
+master-bin.000001	1220	Query	1	1285	COMMIT
 drop table t1;
 alter tablespace ts1
 drop datafile 'datafile.dat'

--- 1.2/mysql-test/r/rpl_ndb_idempotent.result	2006-02-09 19:29:15 +01:00
+++ 1.3/mysql-test/r/rpl_ndb_idempotent.result	2006-03-01 13:31:13 +01:00
@@ -9,14 +9,14 @@
 SELECT * FROM t1 ORDER BY c3;
 c1	c2	c3
 row1	will go away	1
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 @the_epoch:=MAX(epoch)
 <the_epoch>
 SELECT * FROM t1 ORDER BY c3;
 c1	c2	c3
 row1	will go away	1
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM cluster_replication.binlog_index WHERE epoch = <the_epoch> ;
+FROM cluster.binlog_index WHERE epoch = <the_epoch> ;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 <the_pos>	master-bin.000001
 INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);

--- 1.1/mysql-test/r/rpl_ndb_multi.result	2006-01-12 19:50:41 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_multi.result	2006-03-01 13:31:13 +01:00
@@ -16,7 +16,7 @@
 SELECT * FROM t1 ORDER BY c3;
 c1	c2	c3
 row1	will go away	1
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 @the_epoch:=MAX(epoch)
 <the_epoch>
 SELECT * FROM t1 ORDER BY c3;
@@ -24,7 +24,7 @@
 row1	will go away	1
 stop slave;
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM cluster_replication.binlog_index WHERE epoch = <the_epoch> ;
+FROM cluster.binlog_index WHERE epoch = <the_epoch> ;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 102	master-bin1.000001
 CHANGE MASTER TO

--- 1.5/mysql-test/r/rpl_ndb_sync.result	2006-02-22 10:07:31 +01:00
+++ 1.6/mysql-test/r/rpl_ndb_sync.result	2006-03-01 13:31:13 +01:00
@@ -25,13 +25,13 @@
 0	1	BCDEF
 1	0	CD
 0	0	DEFGHIJKL
-CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
-DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
-SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
+CREATE TEMPORARY TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT)ENGINE=HEAP;
+DELETE FROM cluster.backup_info;
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ',';
+SELECT @the_backup_id:=backup_id FROM cluster.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>
-DROP TABLE cluster_replication.backup_info;
+DROP TABLE cluster.backup_info;
 UPDATE t1 SET c2=0 WHERE c3="row2";
 SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
 hex(c1)	hex(c2)	c3
@@ -60,11 +60,11 @@
 0	1	BCDEF
 1	0	CD
 0	0	DEFGHIJKL
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 @the_epoch:=MAX(epoch)
 <the_epoch>
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM cluster_replication.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
+FROM cluster.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 <the_pos>	master-bin.000001
 CHANGE MASTER TO
@@ -89,8 +89,8 @@
 DROP DATABASE ndbsynctest;
 STOP SLAVE;
 reset master;
-select * from cluster_replication.binlog_index;
+select * from cluster.binlog_index;
 Position	File	epoch	inserts	updates	deletes	schemaops
 reset slave;
-select * from cluster_replication.apply_status;
+select * from cluster.apply_status;
 server_id	epoch

--- 1.1/mysql-test/t/ndb_binlog_basic.test	2006-01-12 19:50:43 +01:00
+++ 1.2/mysql-test/t/ndb_binlog_basic.test	2006-03-01 13:31:13 +01:00
@@ -19,7 +19,7 @@
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 save_master_pos;
 --replace_column 1 #
-select @max_epoch:=max(epoch)-1 from cluster_replication.binlog_index;
+select @max_epoch:=max(epoch)-1 from cluster.binlog_index;
 
 delete from t1;
 alter table t1 add (b int);
@@ -38,12 +38,12 @@
 # (save_master_pos waits for last gcp to complete, ensuring that we have
 #  the expected data in the binlog)
 save_master_pos;
-select inserts from cluster_replication.binlog_index where epoch > @max_epoch and inserts > 5;
-select deletes from cluster_replication.binlog_index where epoch > @max_epoch and deletes > 5;
+select inserts from cluster.binlog_index where epoch > @max_epoch and inserts > 5;
+select deletes from cluster.binlog_index where epoch > @max_epoch and deletes > 5;
 select inserts,updates,deletes from 
-  cluster_replication.binlog_index where epoch > @max_epoch and updates > 0;
+  cluster.binlog_index where epoch > @max_epoch and updates > 0;
 select schemaops from 
-  cluster_replication.binlog_index where epoch > @max_epoch and schemaops > 0;
+  cluster.binlog_index where epoch > @max_epoch and schemaops > 0;
 
 #
 # check that purge clears the binlog_index
@@ -51,7 +51,7 @@
 flush logs;
 --sleep 1
 purge master logs before now();
-select count(*) from cluster_replication.binlog_index;
+select count(*) from cluster.binlog_index;
 
 #
 # several tables in different databases
@@ -66,11 +66,11 @@
 insert into mysqltest.t1 values (2,1),(2,2);
 save_master_pos;
 --replace_column 1 #
-select @max_epoch:=max(epoch)-1 from cluster_replication.binlog_index;
+select @max_epoch:=max(epoch)-1 from cluster.binlog_index;
 
 drop table t1;
 drop database mysqltest;
 select inserts,updates,deletes from 
-  cluster_replication.binlog_index where epoch > @max_epoch and inserts > 0;
+  cluster.binlog_index where epoch > @max_epoch and inserts > 0;
 select schemaops from
-  cluster_replication.binlog_index where epoch > @max_epoch and schemaops > 0;
+  cluster.binlog_index where epoch > @max_epoch and schemaops > 0;

--- 1.1/mysql-test/t/ndb_binlog_multi.test	2006-01-12 19:50:43 +01:00
+++ 1.2/mysql-test/t/ndb_binlog_multi.test	2006-03-01 13:31:13 +01:00
@@ -14,7 +14,7 @@
 # and sets up the replication correctly
 #
 
-# no tables and nothing in cluster_replication.binlog_index;
+# no tables and nothing in cluster.binlog_index;
 connection server1;
 SHOW TABLES;
 
@@ -33,7 +33,7 @@
 save_master_pos;
 --replace_column 1 <the_epoch>
 SELECT @the_epoch:=epoch,inserts,updates,deletes,schemaops FROM 
-  cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1;
+  cluster.binlog_index ORDER BY epoch DESC LIMIT 1;
 let $the_epoch= `SELECT @the_epoch`;
 
 # see if we got something on server1
@@ -41,7 +41,7 @@
 SELECT * FROM t2 ORDER BY a;
 --replace_result $the_epoch <the_epoch>
 eval SELECT inserts,updates,deletes,schemaops FROM 
-  cluster_replication.binlog_index WHERE epoch=$the_epoch;
+  cluster.binlog_index WHERE epoch=$the_epoch;
 
 # drop the table on server1
 DROP TABLE t2;
@@ -50,12 +50,12 @@
 save_master_pos;
 --replace_column 1 <the_epoch2>
 SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM 
-  cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1;
+  cluster.binlog_index ORDER BY epoch DESC LIMIT 1;
 let $the_epoch2= `SELECT @the_epoch2`;
 
 --replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2>
 eval SELECT inserts,updates,deletes,schemaops FROM
-   cluster_replication.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2;
+   cluster.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2;
 drop table t1;
 
 # flush on server2
@@ -63,7 +63,7 @@
 SHOW TABLES;
 --replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2>
 eval SELECT inserts,updates,deletes,schemaops FROM
-   cluster_replication.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2;
+   cluster.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2;
 
 # reset
 connection server1;

--- 1.4/mysql-test/t/rpl_ndb_bank.test	2006-02-22 10:07:31 +01:00
+++ 1.5/mysql-test/t/rpl_ndb_bank.test	2006-03-01 13:31:13 +01:00
@@ -118,11 +118,11 @@
 
 # there is no neat way to find the backupid, this is a hack to find it...
 --exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
-DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+CREATE TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+DELETE FROM cluster.backup_info;
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ',';
 --replace_column 1 <the_backup_id>
-SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
+SELECT @the_backup_id:=backup_id FROM cluster.backup_info;
 let the_backup_id=`select @the_backup_id`;
 
 # restore on slave, first check that nothing is there
@@ -140,7 +140,7 @@
 # 1.
 --connection slave
 --replace_column 1 <the_epoch>
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 --let $the_epoch= `select @the_epoch`
 
 # 2.
@@ -148,7 +148,7 @@
 --replace_result $the_epoch <the_epoch>
 --replace_column 1 <the_pos>
 eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-   FROM cluster_replication.binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1;
+   FROM cluster.binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1;
 --let $the_pos= `SELECT @the_pos`
 --let $the_file= `SELECT @the_file`
 

--- 1.2/mysql-test/t/rpl_ndb_idempotent.test	2006-02-09 19:28:33 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_idempotent.test	2006-03-01 13:31:13 +01:00
@@ -4,7 +4,7 @@
 
 #
 # Currently test only works with ndb since it retrieves "old"
-# binlog positions with cluster_replication.binlog_index and apply_status;
+# binlog positions with cluster.binlog_index and apply_status;
 #
 
 # create a table with one row
@@ -15,7 +15,7 @@
 # sync slave and retrieve epoch
 sync_slave_with_master;
 --replace_column 1 <the_epoch>
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 let $the_epoch= `select @the_epoch` ;
 SELECT * FROM t1 ORDER BY c3;
 
@@ -24,7 +24,7 @@
 --replace_result $the_epoch <the_epoch>
 --replace_column 1 <the_pos>
 eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-   FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
+   FROM cluster.binlog_index WHERE epoch = $the_epoch ;
 let $the_pos= `SELECT @the_pos` ;
 let $the_file= `SELECT @the_file` ;
 

--- 1.1/mysql-test/t/rpl_ndb_multi.test	2006-01-12 19:50:47 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_multi.test	2006-03-01 13:31:13 +01:00
@@ -7,7 +7,7 @@
 
 #
 # Currently test only works with ndb since it retrieves "old"
-# binlog positions with cluster_replication.binlog_index and apply_status;
+# binlog positions with cluster.binlog_index and apply_status;
 #
 
 # create a table with one row, and make sure the other "master" gets it
@@ -25,7 +25,7 @@
 connection master;
 sync_slave_with_master;
 --replace_column 1 <the_epoch>
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 let $the_epoch= `select @the_epoch` ;
 SELECT * FROM t1 ORDER BY c3;
 stop slave;
@@ -34,7 +34,7 @@
 connection server2;
 --replace_result $the_epoch <the_epoch>
 eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-   FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
+   FROM cluster.binlog_index WHERE epoch = $the_epoch ;
 let $the_pos= `SELECT @the_pos` ;
 let $the_file= `SELECT @the_file` ;
 

--- 1.6/mysql-test/t/rpl_ndb_sync.test	2006-02-22 10:07:31 +01:00
+++ 1.7/mysql-test/t/rpl_ndb_sync.test	2006-03-01 13:31:13 +01:00
@@ -4,7 +4,7 @@
 
 #
 # Currently test only works with ndb since it retrieves "old"
-# binlog positions with cluster_replication.binlog_index and apply_status;
+# binlog positions with cluster.binlog_index and apply_status;
 #
 
 # stop the save
@@ -27,13 +27,13 @@
 # take a backup on master
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
-CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
-DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+CREATE TEMPORARY TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT)ENGINE=HEAP;
+DELETE FROM cluster.backup_info;
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ',';
 --replace_column 1 <the_backup_id>
-SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
+SELECT @the_backup_id:=backup_id FROM cluster.backup_info;
 let the_backup_id=`select @the_backup_id` ;
-DROP TABLE cluster_replication.backup_info;
+DROP TABLE cluster.backup_info;
 # update a row
 UPDATE t1 SET c2=0 WHERE c3="row2";
 SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
@@ -73,7 +73,7 @@
 # 1.
 connection slave;
 --replace_column 1 <the_epoch>
-SELECT @the_epoch:=MAX(epoch) FROM cluster_replication.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM cluster.apply_status;
 let $the_epoch= `select @the_epoch` ;
 
 # 2.
@@ -81,7 +81,7 @@
 --replace_result $the_epoch <the_epoch>
 --replace_column 1 <the_pos>
 eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-   FROM cluster_replication.binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1;
+   FROM cluster.binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1;
 let $the_pos= `SELECT @the_pos` ;
 let $the_file= `SELECT @the_file` ;
 
@@ -124,11 +124,11 @@
 connection master;
 reset master;
 # should now contain nothing
-select * from cluster_replication.binlog_index;
+select * from cluster.binlog_index;
 
 connection slave;
 reset slave;
 # should now contain nothing
-select * from cluster_replication.apply_status;
+select * from cluster.apply_status;
 
 # End 5.1 Test

--- 1.28/sql/ha_ndbcluster_binlog.cc	2006-02-28 12:40:10 +01:00
+++ 1.29/sql/ha_ndbcluster_binlog.cc	2006-03-01 13:31:13 +01:00
@@ -184,8 +184,8 @@
   Run a query through mysql_parse
 
   Used to:
-  - purging the cluster_replication.binlog_index
-  - creating the cluster_replication.apply_status table
+  - purging the binlog_index
+  - creating the apply_status table
 */
 static void run_query(THD *thd, char *buf, char *end,
                       my_bool print_error, my_bool disable_binlog)
@@ -606,7 +606,7 @@
 
 
 /*
-  check the availability af the cluster_replication.apply_status share
+  check the availability af the apply_status share
   - return share, but do not increase refcount
   - return 0 if there is no share
 */
@@ -624,7 +624,7 @@
 }
 
 /*
-  check the availability af the cluster_replication.schema share
+  check the availability af the schema share
   - return share, but do not increase refcount
   - return 0 if there is no share
 */
@@ -642,7 +642,7 @@
 }
 
 /*
-  Create the cluster_replication.apply_status table
+  Create the apply_status table
 */
 static int ndbcluster_create_apply_status_table(THD *thd)
 {
@@ -691,7 +691,7 @@
 
 
 /*
-  Create the cluster_replication.schema table
+  Create the schema table
 */
 static int ndbcluster_create_schema_table(THD *thd)
 {
@@ -1655,13 +1655,13 @@
 
 /*********************************************************************
   Internal helper functions for handeling of the cluster replication tables
-  - cluster_replication.binlog_index
-  - cluster_replication.apply_status
+  - binlog_index
+  - apply_status
 *********************************************************************/
 
 /*
   struct to hold the data to be inserted into the
-  cluster_replication.binlog_index table
+  binlog_index table
 */
 struct Binlog_index_row {
   ulonglong gci;
@@ -1674,7 +1674,7 @@
 };
 
 /*
-  Open the cluster_replication.binlog_index table
+  Open the binlog_index table
 */
 static int open_binlog_index(THD *thd, TABLE_LIST *tables,
                              TABLE **binlog_index)
@@ -1705,7 +1705,7 @@
 }
 
 /*
-  Insert one row in the cluster_replication.binlog_index
+  Insert one row in the binlog_index
 
   declared friend in handler.h to be able to call write_row directly
   so that this insert is not replicated

--- 1.1/sql/ha_ndbcluster_tables.h	2006-01-12 19:50:49 +01:00
+++ 1.2/sql/ha_ndbcluster_tables.h	2006-03-01 13:31:14 +01:00
@@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#define NDB_REP_DB      "cluster_replication"
+#define NDB_REP_DB      "cluster"
 #define NDB_REP_TABLE   "binlog_index"
 #define NDB_APPLY_TABLE "apply_status"
 #define NDB_SCHEMA_TABLE "schema"

--- 1.37/scripts/mysql_create_system_tables.sh	2006-02-01 11:28:40 +01:00
+++ 1.38/scripts/mysql_create_system_tables.sh	2006-03-01 13:31:13 +01:00
@@ -874,8 +874,8 @@
 $c_gl
 $c_sl
 $c_ev
-CREATE DATABASE IF NOT EXISTS cluster_replication;
-CREATE TABLE IF NOT EXISTS cluster_replication.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
+CREATE DATABASE IF NOT EXISTS cluster;
+CREATE TABLE IF NOT EXISTS cluster.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
 
 END_OF_DATA
 
Thread
bk commit into 5.1 tree (tomas:1.2213) BUG#17805tomas1 Mar