bzr push into mysql-6.0 branch (mats:2688)

[Mats Kindahl]

 2688 Mats Kindahl	2008-09-08 [merge]
      Merging in 6.0-5.1.29-rc
removed:
  include/mysql_h.ic
added:
  include/mysql.h.pp
  include/mysql/plugin.h.pp
  sql/mysql_priv.h.pp
modified:
  Makefile.am
  configure.in
  include/Makefile.am

=== added file 'mysql-test/r/rpl_slave-running.result'
--- a/mysql-test/r/rpl_slave-running.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave-running.result	2008-09-08 07:45:45 +0000
@@ -0,0 +1,3 @@
+show status like 'Slave_running';
+Variable_name	Value
+Slave_running	ON

=== added file 'mysql-test/r/rpl_slave-stopped.result'
--- a/mysql-test/r/rpl_slave-stopped.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave-stopped.result	2008-09-08 07:45:45 +0000
@@ -0,0 +1,3 @@
+show status like 'Slave_running';
+Variable_name	Value
+Slave_running	OFF

=== removed file 'mysql-test/suite/rpl/t/rpl_load_table_from_master.test'
--- a/mysql-test/suite/rpl/t/rpl_load_table_from_master.test	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_load_table_from_master.test	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-###########################################################
-# Change Author: JBM
-# Change Date: 2006-2-2
-# Change: Added ENGINE=$engine_type for first create table
-# Reason: Only MyISAM supports load from master no need to
-# run test case for other engines, in addition test will
-# fail if other engines are set as default engine
-###########################################################
-# Change Author: JBM
-# Change Date: 2006-2-3
-# Change: removed ENGINE=$engine_type for first create table
-# and renamed test file to rpl_load_table_from_master.test.
-# In addition added test requirements.
-# Reason: Request from review.
-############################################################
-# REQUIREMENT TEST 1:
-# LOAD TABLE FROM MASTER must work with a forced timestamp.
-############################################################
-#
-# Test forced timestamp
-#
--- source include/master-slave.inc
-
--- echo "******************** Test Requirment 1 *************"
-
-# Don't log table creating to the slave as we want to test LOAD TABLE
-SET SQL_LOG_BIN=0,timestamp=200006;
-eval CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM;
-INSERT INTO t1 ( a) VALUE ('F');
-select unix_timestamp(t) from t1;
-connection slave;
-load table t1 from master;
-select unix_timestamp(t) from t1;
-
-# Delete the created table on master and slave
-connection master;
-set SQL_LOG_BIN=1,timestamp=default;
-drop table t1;
-save_master_pos;
-connection slave;
-sync_with_master;
-connection master;
-
-#
-# Test copying table with checksum
-#
-
-# Don't log table creating to the slave as we want to test LOAD TABLE
-set SQL_LOG_BIN=0;
-
-#######################################################
-# REQUIREMENTi TEST 2:
-#LOAD TABLE FROM MASTER must work with table checksum
-#######################################################
--- echo "******************** Test Requirment 2 *************"
-
-eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
-INSERT INTO t1 VALUES (1);
-save_master_pos;
-connection slave;
-sync_with_master;
-load table t1 from master;
-check table t1;
-drop table t1;
-connection master;
-drop table t1;
-save_master_pos;
-connection slave;
-sync_with_master;
-
-connection master;
-set SQL_LOG_BIN=0;
-create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
-load data infile '../std_data_ln/words.dat' into table t1;
-create table t2 (word char(20) not null)ENGINE=MyISAM;
-load data infile '../std_data_ln/words.dat' into table t2;
-create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
-connection slave;
-load table t1 from master;
-load table t2 from master;
-load table t3 from master;
-check table t1;
-select count(*) from t2;
-select count(*) from t3;
-connection master;
-set SQL_LOG_BIN=1;
-drop table if exists t1,t2,t3;
-save_master_pos;
-connection slave;
-sync_with_master;
-create table t1(n int);
-drop table t1;
-
-
-
-
-
-# End of 4.1 tests

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-09-05 13:39:08 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-09-08 07:45:45 +0000
@@ -7,7 +7,7 @@ start slave;
 stop slave;
 reset master;
 reset slave;
-reset master;
+start slave;
 create table t1(n int not null auto_increment primary key)ENGINE=NDB;
 insert into t1 values (NULL);
 drop table t1;
@@ -117,7 +117,6 @@ Aberdeen
 Abernathy
 aberrant
 aberration
-start slave;
 
 let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;