bk commit into 6.0 tree (istruewing:1.2617) WL#866

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
6.0 repository of istruewing.  When istruewing 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@stripped, 2008-05-08 22:27:37+02:00, istruewing@stripped +9 -0
  WL#866 - Online backup driver for MyISAM
  
  Fixes for port to current backup kernel.

  mysql-test/lib/mtr_report.pl@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped +2
-0
    Suppress an intentionally provoked error.

  mysql-test/r/backup_myisam2.result@stripped, 2008-05-08 22:27:35+02:00,
istruewing@stripped +6 -14
    Fix result for newer report format.

  mysql-test/r/debug_sync.result@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped
+1 -1
    Post-merge fix.

  mysql-test/t/backup_charsets.test@stripped, 2008-05-08 22:27:35+02:00,
istruewing@stripped +2 -0
    Suppress backup test on embedded server.

  mysql-test/t/backup_myisam1.test@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped
+14 -0
    Suppress backup test on embedded server.
    Added cleanup.
    Fixed result from new report format.

  mysql-test/t/backup_myisam2.test@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped
+21 -3
    Suppress backup test on embedded server.
    Added cleanup.
    Fixed result from new report format.

  mysql-test/t/backup_no_be.test@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped
+2 -1
    Suppress backup test on embedded server.
    Fixed a typo.

  mysql-test/t/myisamlog.test@stripped, 2008-05-08 22:27:35+02:00, istruewing@stripped +2
-0
    Suppress test on embedded server.

  sql/backup/stream_v1_transport.c@stripped, 2008-05-08 22:27:35+02:00,
istruewing@stripped +1 -1
    Preliminarily reduced default block size.

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2008-05-05 21:33:22 +02:00
+++ b/mysql-test/lib/mtr_report.pl	2008-05-08 22:27:35 +02:00
@@ -342,6 +342,8 @@ sub mtr_report_stats ($) {
 		# ignore warning generated when backup engine selection algorithm is tested
 		($testname eq 'main.backup_no_be') and /Backup: Cannot create backup engine/ or
 		
+                ($testname eq 'main.backup_myisam1') and
+                (/Backup: Can't initialize MyISAM backup driver/) or
 		/Sort aborted/ or
 		/Time-out in NDB/ or
 		/One can only use the --user.*root/ or
diff -Nrup a/mysql-test/r/backup_myisam2.result b/mysql-test/r/backup_myisam2.result
--- a/mysql-test/r/backup_myisam2.result	2008-05-07 17:30:59 +02:00
+++ b/mysql-test/r/backup_myisam2.result	2008-05-08 22:27:35 +02:00
@@ -5,7 +5,7 @@ CREATE TABLE t1 (a longtext) engine=myis
 SELECT get_lock("data_prepare", 100);
 get_lock("data_prepare", 100)
 1
-SET SESSION debug="+d,enter,info,query,backup_debug";
+SET SESSION debug="+d,query,enter,info,query,backup_debug";
 BACKUP DATABASE mysqltest TO 'test.ba';
 use mysqltest;
 insert into t1 values ("text");
@@ -34,23 +34,15 @@ mysqltest.t1	1728069308
 SELECT release_lock("data_prepare");
 release_lock("data_prepare")
 1
-Backup Summary
- header     =       26 bytes
- meta-data  =       79 bytes
- data       =   528071 bytes
-              --------------
- total          528176 bytes
+backup_id
+#
 repair table t1 quick;
 Table	Op	Msg_type	Msg_text
 mysqltest.t1	repair	status	OK
 DROP DATABASE mysqltest;
 RESTORE FROM 'test.ba';
-Restore Summary
- header     =       26 bytes
- meta-data  =       79 bytes
- data       =   528071 bytes
-              --------------
- total          528176 bytes
+backup_id
+#
 select length(a) from t1;
 length(a)
 262144
@@ -58,4 +50,4 @@ checksum table t1;
 Table	Checksum
 mysqltest.t1	1728069308
 drop database mysqltest;
-SET SESSION debug="-d,enter,info,query,backup_debug";
+SET SESSION debug="-d,query,enter,info,query,backup_debug";
diff -Nrup a/mysql-test/r/debug_sync.result b/mysql-test/r/debug_sync.result
--- a/mysql-test/r/debug_sync.result	2008-04-29 16:16:49 +02:00
+++ b/mysql-test/r/debug_sync.result	2008-05-08 22:27:35 +02:00
@@ -137,7 +137,7 @@ Variable_name	Value
 debug_sync	ON - current signal: 'something'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 Warnings:
-Warning	1673	debug sync point wait timed out
+Warning	1717	debug sync point wait timed out
 SET DEBUG_SYNC= 'now SIGNAL nothing';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
diff -Nrup a/mysql-test/t/backup_charsets.test b/mysql-test/t/backup_charsets.test
--- a/mysql-test/t/backup_charsets.test	2008-05-05 17:03:15 +02:00
+++ b/mysql-test/t/backup_charsets.test	2008-05-08 22:27:35 +02:00
@@ -17,6 +17,8 @@
 #   regardless of character set settings on backup and restore servers. 
 #
 
+--source include/not_embedded.inc
+
 disable_warnings;
 DROP DATABASE IF EXISTS backup_cs;
 error 0,1;
diff -Nrup a/mysql-test/t/backup_myisam1.test b/mysql-test/t/backup_myisam1.test
--- a/mysql-test/t/backup_myisam1.test	2008-05-07 17:30:59 +02:00
+++ b/mysql-test/t/backup_myisam1.test	2008-05-08 22:27:35 +02:00
@@ -1,14 +1,28 @@
 # Test specific of MyISAM's online backup:
 # see if --external-locking=1 causes backup to fail as expected
 
+--source include/not_embedded.inc
+
+#
+# Cleanup from former test cases
+#
 --disable_warnings
 drop database if exists mysqltest;
 --enable_warnings
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/test.ba
+
 create database mysqltest;
 use mysqltest;
 CREATE TABLE t1 (a int) engine=myisam;
 
+--replace_column 1 #
 --error ER_GET_ERRMSG
 BACKUP DATABASE mysqltest TO 'test.ba';
 
+#
+# Cleanup from this test case
+#
 DROP DATABASE mysqltest;
+--remove_file $MYSQLTEST_VARDIR/master-data/test.ba
+
diff -Nrup a/mysql-test/t/backup_myisam2.test b/mysql-test/t/backup_myisam2.test
--- a/mysql-test/t/backup_myisam2.test	2008-05-07 17:30:59 +02:00
+++ b/mysql-test/t/backup_myisam2.test	2008-05-08 22:27:35 +02:00
@@ -1,7 +1,17 @@
 # Tests specific of MyISAM's online backup
 
+--source include/not_embedded.inc
 --source include/have_debug.inc
 
+#
+# Cleanup from former test cases
+#
+--disable_warnings
+drop database if exists mysqltest;
+--enable_warnings
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/test.ba
+
 connect (backup,localhost,root,,);
 connect (restore,localhost,root,,);
 
@@ -13,9 +23,6 @@ connect (syncer,localhost,root,,);
 
 connection backup;
 
---disable_warnings
-drop database if exists mysqltest;
---enable_warnings
 create database mysqltest;
 use mysqltest;
 
@@ -32,6 +39,7 @@ SELECT get_lock("data_prepare", 100);
 connection backup;
 # prepare to block:
 SET SESSION debug="+d,query,enter,info,query,backup_debug";
+
 send BACKUP DATABASE mysqltest TO 'test.ba';
 
 connection restore;
@@ -56,11 +64,21 @@ connection syncer;
 SELECT release_lock("data_prepare");
 
 connection backup;
+--replace_column 1 #
 reap;
 repair table t1 quick;
 DROP DATABASE mysqltest;
+
+--replace_column 1 #
 RESTORE FROM 'test.ba';
+
 select length(a) from t1;
 checksum table t1;
+
+#
+# Cleanup from this test case
+#
 drop database mysqltest;
+--remove_file $MYSQLTEST_VARDIR/master-data/test.ba
+
 SET SESSION debug="-d,query,enter,info,query,backup_debug";
diff -Nrup a/mysql-test/t/backup_no_be.test b/mysql-test/t/backup_no_be.test
--- a/mysql-test/t/backup_no_be.test	2008-04-16 20:23:01 +02:00
+++ b/mysql-test/t/backup_no_be.test	2008-05-08 22:27:35 +02:00
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/not_embedded.inc
 
 #
 # This test script tests the behaviour reported in BUG#34721
@@ -66,7 +67,7 @@ SELECT @@debug;
 --remove_file $MYSQLTEST_VARDIR/master-data/db1.bak
 --replace_column 1 #
 BACKUP DATABASE db1 TO 'db1.bak';
---enable_warings
+--enable_warnings
 
 # Don't show warning message code
 --replace_column 2 #
diff -Nrup a/mysql-test/t/myisamlog.test b/mysql-test/t/myisamlog.test
--- a/mysql-test/t/myisamlog.test	2008-05-07 17:30:59 +02:00
+++ b/mysql-test/t/myisamlog.test	2008-05-08 22:27:35 +02:00
@@ -1,6 +1,8 @@
 # Test of MyISAM logical logging and the myisamlog utility:
 # see if they can repopulate a table.
 
+--source include/not_embedded.inc
+
 disable_warnings;
 create database if not exists mysqltest;
 use mysqltest;
diff -Nrup a/sql/backup/stream_v1_transport.c b/sql/backup/stream_v1_transport.c
--- a/sql/backup/stream_v1_transport.c	2008-05-07 17:30:58 +02:00
+++ b/sql/backup/stream_v1_transport.c	2008-05-08 22:27:35 +02:00
@@ -30,7 +30,7 @@
 
   @note Block size should be >= 8 bytes.
 */
-#define DEFAULT_BLOCK_SIZE  (32*1024)
+#define DEFAULT_BLOCK_SIZE  (16*1024)
 
 /**
   @brief Input buffer size.