Merge lp:~akopytov/percona-xtrabackup/bug1183500-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/354/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-05-07 13:32:47 +0000
+++ test/inc/common.sh	2013-06-29 03:20:36 +0000
@@ -351,25 +351,58 @@
 }
 
 ########################################################################
+# Shutdown cleanly server specified with the first argument
+########################################################################
+function shutdown_server_with_id()
+{
+    local id=$1
+    switch_server $id
+
+    vlog "Shutting down server with id=$id..."
+
+    if [ -f "${MYSQLD_PIDFILE}" ]
+    then
+        ${MYSQLADMIN} ${MYSQL_ARGS} shutdown
+    else
+        vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"
+    fi
+
+    # unlock the port number
+    free_reserved_port $MYSQLD_PORT
+
+    reset_server_variables $id
+}
+
+########################################################################
 # Shutdown server with id=1 cleanly
 ########################################################################
 function shutdown_server()
 {
-    switch_server 1
-
-    vlog "Shutting down server with id=1..."
-
-    if [ -f "${MYSQLD_PIDFILE}" ]
-    then
-        ${MYSQLADMIN} ${MYSQL_ARGS} shutdown
-    else
-        vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"
-    fi
-
-    # unlock the port number
-    free_reserved_port $MYSQLD_PORT
-
-    reset_server_variables 1
+    shutdown_server_with_id 1
+}
+
+########################################################################
+# Force a checkpoint for a server specified with the first argument
+########################################################################
+function force_checkpoint_with_server_id()
+{
+    local id=$1
+    shift
+
+    switch_server $id
+
+    vlog "Forcing a checkpoint for server #$id"
+
+    shutdown_server_with_id $id
+    start_server_with_id $id $*
+}
+
+########################################################################
+# Force a checkpoint for server id=1
+########################################################################
+function force_checkpoint()
+{
+    force_checkpoint_with_server_id 1 $*
 }
 
 ########################################################################
 
=== modified file 'test/t/bug1130627.sh'
--- test/t/bug1130627.sh	2013-03-07 11:48:43 +0000
+++ test/t/bug1130627.sh	2013-06-29 03:20:36 +0000
@@ -5,7 +5,9 @@
 . inc/common.sh
 . inc/ib_part.sh
 
-start_server --innodb_file_per_table
+MYSQLD_EXTRA_MY_CNF_OPTS="innodb-file-per-table"
+
+start_server
 
 require_partitioning
 
@@ -27,9 +29,7 @@
 PARTITIONS 10 */;
 EOF
 
-# Force a checkpoint
-stop_server
-start_server --innodb_file_per_table
+force_checkpoint
 
 # Test that specifying partitions with --include works
 innobackupex --no-timestamp --include='^test.*#P#p5' $topdir/backup
 
=== modified file 'test/t/bug766607.sh'
--- test/t/bug766607.sh	2013-03-07 11:38:14 +0000
+++ test/t/bug766607.sh	2013-06-29 03:20:36 +0000
@@ -1,6 +1,8 @@
 . inc/common.sh
 
-start_server --innodb_file_per_table
+MYSQLD_EXTRA_MY_CNF_OPTS="innodb-file-per-table"
+
+start_server
 load_dbase_schema incremental_sample
 
 # Backup dir
@@ -15,8 +17,7 @@
 FLUSH LOGS;
 EOF
 
-stop_server
-start_server --innodb_file_per_table
+force_checkpoint
 
 vlog "Making incremental backup"
 innobackupex --incremental --no-timestamp --incremental-basedir=$topdir/backup/full $topdir/backup/delta
@@ -42,6 +43,6 @@
 cd $topdir
 
 vlog "Data restored"
-start_server --innodb_file_per_table
+start_server
 
 run_cmd $MYSQL $MYSQL_ARGS -e "SELECT * FROM t" test
 
=== modified file 'test/t/tar4ibd_symlink.sh'
--- test/t/tar4ibd_symlink.sh	2012-06-05 12:35:33 +0000
+++ test/t/tar4ibd_symlink.sh	2013-06-29 03:20:36 +0000
@@ -10,8 +10,7 @@
 load_dbase_data sakila
 
 # Force a checkpoint
-stop_server
-start_server
+force_checkpoint
 
 # Copy some .ibd files to a temporary location and replace them with symlinks