bzr commit into mysql-6.0-rpl branch (hezx:2696)

[He Zhenxing]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-rpl

 2696 He Zhenxing	2008-09-28
      Post fixes after merge 6.0 main -> 6.0-rpl
modified:
  mysql-test/r/backup_errors.result
  mysql-test/r/backup_logs.result
  mysql-test/r/backup_securefilepriv.result
  mysql-test/r/events_bugs.result
  mysql-test/t/backup_blob.test
  mysql-test/t/backup_errors.test
  mysql-test/t/backup_logs.test
  mysql-test/t/backup_logs_output.test
  mysql-test/t/backup_securefilepriv-master.opt
  mysql-test/t/backup_securefilepriv.test
  mysql-test/t/events_bugs.test
  sql/Makefile.am

=== modified file 'mysql-test/r/backup_errors.result'
--- a/mysql-test/r/backup_errors.result	2008-09-27 12:05:46 +0000
+++ b/mysql-test/r/backup_errors.result	2008-09-28 14:43:37 +0000
@@ -1,6 +1,7 @@
 call mtr.add_supression("Backup:");
 call mtr.add_supression("Restore:");
 call mtr.add_supression("Can't open the online backup progress tables");
+call mtr.add_supression("Can't open the backup log tables");
 DROP DATABASE IF EXISTS adb;
 DROP DATABASE IF EXISTS bdb;
 RESTORE FROM 'test.bak';

=== modified file 'mysql-test/r/backup_logs.result'
--- a/mysql-test/r/backup_logs.result	2008-08-29 22:37:36 +0000
+++ b/mysql-test/r/backup_logs.result	2008-09-28 14:43:37 +0000
@@ -201,4 +201,5 @@ The backup id for this command should be
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 backup_id
 503
+SET SESSION debug="";
 DROP DATABASE backup_logs;

=== modified file 'mysql-test/r/backup_securefilepriv.result'
--- a/mysql-test/r/backup_securefilepriv.result	2008-09-02 09:04:39 +0000
+++ b/mysql-test/r/backup_securefilepriv.result	2008-09-28 14:43:37 +0000
@@ -9,26 +9,26 @@ INSERT INTO mysqltest.t1 VALUES (1),(2),
 Starting tests
 
 Backup to path specified by --secure-file-priv option
-(MYSQLTEST_VARDIR/master-data/securefilepriv_path)
+(MYSQLD_DATADIR/securefilepriv_path)
 BACKUP DATABASE mysqltest TO 'securefilepriv_path/bup_sfp1.bak';
 backup_id
 #
 Ensure backup image file went to the correct location
 
 Backup to subpath of path specified by --secure-file-priv option
-(MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+(MYSQLD_DATADIR/securefilepriv_path/subpath)
 BACKUP DATABASE mysqltest TO 'securefilepriv_path/subpath/bup_sfp2.bak';
 backup_id
 #
 Ensure backup image file went to the correct location
 
 Change backupdir to securefilepriv_path/subpath 
-(MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+(MYSQLD_DATADIR/securefilepriv_path/subpath)
 SET @@global.backupdir = 'securefilepriv_path/subpath';
 
 Backup to subpath of path specified by --secure-file-priv option, 
 no dir in backup file name
-(MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+(MYSQLD_DATADIR/securefilepriv_path/subpath)
 BACKUP DATABASE mysqltest TO 'bup_sfp3.bak';
 backup_id
 #
@@ -36,7 +36,7 @@ Ensure backup image file went to the cor
 
 Backup to path specified by --secure-file-priv, 
 relative path in backup file name
-(MYSQLTEST_VARDIR/master-data/securefilepriv_path)
+(MYSQLD_DATADIR/securefilepriv_path)
 BACKUP DATABASE mysqltest TO '../bup_sfp4.bak';
 backup_id
 #
@@ -47,7 +47,7 @@ option should fail
 BACKUP DATABASE mysqltest TO '../../bup_sfp_fail1.bak';
 ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot
execute this statement
 
-Reset backupdir to MYSQLTEST_VARDIR/master-data/
+Reset backupdir to MYSQLD_DATADIR/
 SET @@global.backupdir = @@global.datadir;
 
 Backup to other path than specified by --secure-file-priv should fail

=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2008-09-27 12:05:46 +0000
+++ b/mysql-test/r/events_bugs.result	2008-09-28 14:43:37 +0000
@@ -736,5 +736,4 @@ select name from mysql.event where name 
 name
 drop event e1;
 DROP DATABASE events_test;
-# restore the defeault
-SET GLOBAL event_scheduler = 'on';
+SET GLOBAL event_scheduler= 'ON';

=== modified file 'mysql-test/t/backup_blob.test'
--- a/mysql-test/t/backup_blob.test	2008-09-09 08:19:21 +0000
+++ b/mysql-test/t/backup_blob.test	2008-09-28 14:43:37 +0000
@@ -9,6 +9,8 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 
+let $MYSQLD_DATADIR=`select @@datadir`;
+
 --disable_warnings
 DROP DATABASE IF EXISTS mysqltest;
 --enable_warnings
@@ -61,4 +63,4 @@ CHECKSUM TABLE t3;
 
 DROP DATABASE mysqltest;
 
---remove_file $MYSQLTEST_VARDIR/master-data/blob.bak
+--remove_file $MYSQLD_DATADIR/blob.bak

=== modified file 'mysql-test/t/backup_errors.test'
--- a/mysql-test/t/backup_errors.test	2008-09-27 12:05:46 +0000
+++ b/mysql-test/t/backup_errors.test	2008-09-28 14:43:37 +0000
@@ -10,6 +10,7 @@
 call mtr.add_supression("Backup:");
 call mtr.add_supression("Restore:");
 call mtr.add_supression("Can't open the online backup progress tables");
+call mtr.add_supression("Can't open the backup log tables");
 
 --disable_warnings
 DROP DATABASE IF EXISTS adb;

=== modified file 'mysql-test/t/backup_logs.test'
--- a/mysql-test/t/backup_logs.test	2008-09-27 12:05:46 +0000
+++ b/mysql-test/t/backup_logs.test	2008-09-28 14:43:37 +0000
@@ -39,14 +39,10 @@ ORDER BY column_name;
 # Preparative cleanup.
 #
 --disable_warnings
-SET DEBUG_SYNC= 'reset';
-DROP DATABASE IF EXISTS backup_progress;
 DROP DATABASE IF EXISTS backup_logs;
-DROP TABLE IF EXISTS backup_progress.t1_res;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/backup_progress_orig.bak;
 remove_file $MYSQLD_DATADIR/backup_logs_orig.bak;
 --enable_warnings
 
@@ -203,7 +199,7 @@ SET DEBUG_SYNC= 'RESET';
 #
 SET SESSION debug="d,set_backup_id";
 
---remove_file $MYSQLTEST_VARDIR/master-data/backup_logs_orig.bak
+--remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
 
 #
 # The first backup will cause the value to be set to 500 and written to file.
@@ -213,23 +209,21 @@ BACKUP DATABASE backup_logs to 'backup_l
 
 SET SESSION debug="d";
 
---remove_file $MYSQLTEST_VARDIR/master-data/backup_logs_orig.bak
+--remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
 --echo The backup id for this command should be 501.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
---remove_file $MYSQLTEST_VARDIR/master-data/backup_logs_orig.bak
+--remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
 --echo The backup id for this command should be 502.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
---remove_file $MYSQLTEST_VARDIR/master-data/backup_logs_orig.bak
+--remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
 --echo The backup id for this command should be 503.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
 #
 # Cleanup.
 #
-SET DEBUG_SYNC= 'reset';
-DROP DATABASE backup_progress;
-remove_file $MYSQLD_DATADIR/backup_progress_orig.bak;
+SET SESSION debug="";
 DROP DATABASE backup_logs;
 remove_file $MYSQLD_DATADIR/backup_logs_orig.bak;

=== modified file 'mysql-test/t/backup_logs_output.test'
--- a/mysql-test/t/backup_logs_output.test	2008-08-27 17:35:10 +0000
+++ b/mysql-test/t/backup_logs_output.test	2008-09-28 14:43:37 +0000
@@ -7,6 +7,8 @@
 
 --source include/not_embedded.inc
 
+let $MYSQLD_DATADIR=`select @@datadir`;
+
 connect (con1,localhost,root,,,,);
 --echo con1
 connection con1;
@@ -52,11 +54,11 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 
@@ -82,11 +84,11 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 --echo '---and the progress log is turned off                   ---'
@@ -114,11 +116,11 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 --echo '---and the history log is turned off                 ---'
@@ -146,11 +148,11 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is FILE---'
 
@@ -182,20 +184,20 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 #
 # BUG#33364 - uncomment when purge command is implemented
 #
 # Check contents of logs for data. 
 #--error 0
-#--exec grep -q "BACKUP DATABASE bup_log TO 'bup_log.bak'"
$MYSQLTEST_VARDIR/master-data/backup_history.log
+#--exec grep -q "BACKUP DATABASE bup_log TO 'bup_log.bak'"
$MYSQLD_DATADIR/backup_history.log
 #--error 0
-#--exec grep -q "complete" $MYSQLTEST_VARDIR/master-data/backup_progress.log
+#--exec grep -q "complete" $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE, FILE---'
 
@@ -223,20 +225,20 @@ SELECT count(*) FROM mysql.backup_histor
 SELECT count(*) FROM mysql.backup_progress;
 
 FLUSH BACKUP LOGS;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
 
 #
 # BUG#33364 - uncomment when purge command is implemented
 #
 # Check contents of logs for data. 
 #--error 0
-#--exec grep -q "BACKUP DATABASE bup_log TO 'bup_log.bak'"
$MYSQLTEST_VARDIR/master-data/backup_history.log
+#--exec grep -q "BACKUP DATABASE bup_log TO 'bup_log.bak'"
$MYSQLD_DATADIR/backup_history.log
 #--error 0
-#--exec grep -q "complete" $MYSQLTEST_VARDIR/master-data/backup_progress.log
+#--exec grep -q "complete" $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 
 --echo Cleanup
 DROP DATABASE bup_log;
@@ -244,5 +246,5 @@ DROP DATABASE bup_log;
 SET @@global.log_backup_output = 'TABLE';
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_log.bak
+--remove_file $MYSQLD_DATADIR/bup_log.bak
 

=== modified file 'mysql-test/t/backup_securefilepriv-master.opt'
--- a/mysql-test/t/backup_securefilepriv-master.opt	2008-09-02 09:04:39 +0000
+++ b/mysql-test/t/backup_securefilepriv-master.opt	2008-09-28 14:43:37 +0000
@@ -1 +1 @@
---secure-file-priv=$MYSQLTEST_VARDIR/master-data/securefilepriv_path
+--secure-file-priv=$MYSQLTEST_VARDIR/mysqld.1/data/securefilepriv_path

=== modified file 'mysql-test/t/backup_securefilepriv.test'
--- a/mysql-test/t/backup_securefilepriv.test	2008-09-02 14:26:40 +0000
+++ b/mysql-test/t/backup_securefilepriv.test	2008-09-28 14:43:37 +0000
@@ -4,21 +4,23 @@
 #
 # See backup_securefilepriv-master.opt for --secure-file-priv command line option
 #
-# backupdir        is MYSQLTEST_VARDIR/master-data/
-# secure-file-priv is MYSQLTEST_VARDIR/master-data/securefilepriv_path/
+# backupdir        is MYSQLD_DATADIR/
+# secure-file-priv is MYSQLD_DATADIR/securefilepriv_path/
 
 --source include/not_embedded.inc
 
 --echo Initializing tests
 
+let $MYSQLD_DATADIR=`select @@datadir`;
+
 --error 0,1
-rmdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath;
+rmdir $MYSQLD_DATADIR/securefilepriv_path/subpath;
 --error 0,1
-rmdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path;
+rmdir $MYSQLD_DATADIR/securefilepriv_path;
 
 --echo Create directories for backup images
-mkdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path;
-mkdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath;
+mkdir $MYSQLD_DATADIR/securefilepriv_path;
+mkdir $MYSQLD_DATADIR/securefilepriv_path/subpath;
 
 --echo Creating database and populating tables
 
@@ -37,58 +39,58 @@ INSERT INTO mysqltest.t1 VALUES (1),(2),
 
 --echo 
 --echo Backup to path specified by --secure-file-priv option
---echo (MYSQLTEST_VARDIR/master-data/securefilepriv_path)
+--echo (MYSQLD_DATADIR/securefilepriv_path)
 --replace_column 1 #
 BACKUP DATABASE mysqltest TO 'securefilepriv_path/bup_sfp1.bak';
 
 --echo Ensure backup image file went to the correct location
---file_exists $MYSQLTEST_VARDIR/master-data/securefilepriv_path/bup_sfp1.bak
+--file_exists $MYSQLD_DATADIR/securefilepriv_path/bup_sfp1.bak
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/securefilepriv_path/bup_sfp1.bak
+--remove_file $MYSQLD_DATADIR/securefilepriv_path/bup_sfp1.bak
 
 --echo  
 --echo Backup to subpath of path specified by --secure-file-priv option
---echo (MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+--echo (MYSQLD_DATADIR/securefilepriv_path/subpath)
 --replace_column 1 #
 BACKUP DATABASE mysqltest TO 'securefilepriv_path/subpath/bup_sfp2.bak';
 
 --echo Ensure backup image file went to the correct location
---file_exists $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath/bup_sfp2.bak
+--file_exists $MYSQLD_DATADIR/securefilepriv_path/subpath/bup_sfp2.bak
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath/bup_sfp2.bak
+--remove_file $MYSQLD_DATADIR/securefilepriv_path/subpath/bup_sfp2.bak
 
 --echo  
 --echo Change backupdir to securefilepriv_path/subpath 
---echo (MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+--echo (MYSQLD_DATADIR/securefilepriv_path/subpath)
 SET @@global.backupdir = 'securefilepriv_path/subpath';
 
 --echo  
 --echo Backup to subpath of path specified by --secure-file-priv option, 
 --echo no dir in backup file name
---echo (MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath)
+--echo (MYSQLD_DATADIR/securefilepriv_path/subpath)
 --replace_column 1 #
 BACKUP DATABASE mysqltest TO 'bup_sfp3.bak';
 
 --echo Ensure backup image file went to the correct location
---file_exists $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath/bup_sfp3.bak
+--file_exists $MYSQLD_DATADIR/securefilepriv_path/subpath/bup_sfp3.bak
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath/bup_sfp3.bak
+--remove_file $MYSQLD_DATADIR/securefilepriv_path/subpath/bup_sfp3.bak
 
 --echo  
 --echo Backup to path specified by --secure-file-priv, 
 --echo relative path in backup file name
---echo (MYSQLTEST_VARDIR/master-data/securefilepriv_path)
+--echo (MYSQLD_DATADIR/securefilepriv_path)
 --replace_column 1 #
 BACKUP DATABASE mysqltest TO '../bup_sfp4.bak';
 
 --echo Ensure backup image file went to the correct location
---file_exists $MYSQLTEST_VARDIR/master-data/securefilepriv_path/bup_sfp4.bak
+--file_exists $MYSQLD_DATADIR/securefilepriv_path/bup_sfp4.bak
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/securefilepriv_path/bup_sfp4.bak
+--remove_file $MYSQLD_DATADIR/securefilepriv_path/bup_sfp4.bak
 
 # Tests that fail
 
@@ -99,7 +101,7 @@ BACKUP DATABASE mysqltest TO '../bup_sfp
 BACKUP DATABASE mysqltest TO '../../bup_sfp_fail1.bak';
 
 --echo  
---echo Reset backupdir to MYSQLTEST_VARDIR/master-data/
+--echo Reset backupdir to MYSQLD_DATADIR/
 SET @@global.backupdir = @@global.datadir;
 
 --echo  
@@ -115,6 +117,6 @@ DROP TABLE mysqltest.t1;
 DROP DATABASE mysqltest;
 
 --error 0,1,2
-rmdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path/subpath;
+rmdir $MYSQLD_DATADIR/securefilepriv_path/subpath;
 --error 0,1,2
-rmdir $MYSQLTEST_VARDIR/master-data/securefilepriv_path;
+rmdir $MYSQLD_DATADIR/securefilepriv_path;

=== modified file 'mysql-test/t/events_bugs.test'
--- a/mysql-test/t/events_bugs.test	2008-09-27 12:05:46 +0000
+++ b/mysql-test/t/events_bugs.test	2008-09-28 14:43:37 +0000
@@ -978,8 +978,6 @@ let $wait_condition=
 --source include/wait_condition.inc
 
 DROP DATABASE events_test;
---echo # restore the defeault
-SET GLOBAL event_scheduler = 'on';
 
 # Restore event_schedulre setting to how it was when test started
 SET GLOBAL event_scheduler= 'ON';

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2008-09-27 12:05:46 +0000
+++ b/sql/Makefile.am	2008-09-28 14:43:37 +0000
@@ -136,7 +136,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_plugin.cc sql_binlog.cc \
 			sql_builtin.cc sql_tablespace.cc partition_info.cc \
 			sql_servers.cc sql_audit.cc sha2.cc \
-			ddl_blocker.cc si_objects.cc si_logs.cc \ 
+			ddl_blocker.cc si_objects.cc si_logs.cc \
 			event_parse_data.cc mdl.cc transaction.cc \
 			rpl_handler.cc