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

Proposed by Alexey Kopytov
Status: Merged
Approved by: Sergei Glushchenko
Approved revision: no longer in the source branch.
Merged at revision: 563
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1183500-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 148 lines (+58/-25)
4 files modified
test/inc/common.sh (+48/-15)
test/t/bug1130627.sh (+4/-4)
test/t/bug766607.sh (+5/-4)
test/t/tar4ibd_symlink.sh (+1/-2)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1183500-2.0
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 Approve
Review via email: mp+172189@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Approve

Revision history for this message
Sergei Glushchenko (sergei.glushchenko) :
review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh 2013-05-07 07:53:25 +0000
+++ test/inc/common.sh 2013-06-29 03:20:34 +0000
@@ -347,25 +347,58 @@
347}347}
348348
349########################################################################349########################################################################
350# Shutdown cleanly server specified with the first argument
351########################################################################
352function shutdown_server_with_id()
353{
354 local id=$1
355 switch_server $id
356
357 vlog "Shutting down server with id=$id..."
358
359 if [ -f "${MYSQLD_PIDFILE}" ]
360 then
361 ${MYSQLADMIN} ${MYSQL_ARGS} shutdown
362 else
363 vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"
364 fi
365
366 # unlock the port number
367 free_reserved_port $MYSQLD_PORT
368
369 reset_server_variables $id
370}
371
372########################################################################
350# Shutdown server with id=1 cleanly373# Shutdown server with id=1 cleanly
351########################################################################374########################################################################
352function shutdown_server()375function shutdown_server()
353{376{
354 switch_server 1377 shutdown_server_with_id 1
355378}
356 vlog "Shutting down server with id=1..."379
357380########################################################################
358 if [ -f "${MYSQLD_PIDFILE}" ]381# Force a checkpoint for a server specified with the first argument
359 then382########################################################################
360 ${MYSQLADMIN} ${MYSQL_ARGS} shutdown383function force_checkpoint_with_server_id()
361 else384{
362 vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"385 local id=$1
363 fi386 shift
364387
365 # unlock the port number388 switch_server $id
366 free_reserved_port $MYSQLD_PORT389
367390 vlog "Forcing a checkpoint for server #$id"
368 reset_server_variables 1391
392 shutdown_server_with_id $id
393 start_server_with_id $id $*
394}
395
396########################################################################
397# Force a checkpoint for server id=1
398########################################################################
399function force_checkpoint()
400{
401 force_checkpoint_with_server_id 1 $*
369}402}
370403
371########################################################################404########################################################################
372405
=== 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:34 +0000
@@ -5,7 +5,9 @@
5. inc/common.sh5. inc/common.sh
6. inc/ib_part.sh6. inc/ib_part.sh
77
8start_server --innodb_file_per_table8MYSQLD_EXTRA_MY_CNF_OPTS="innodb-file-per-table"
9
10start_server
911
10require_partitioning12require_partitioning
1113
@@ -27,9 +29,7 @@
27PARTITIONS 10 */;29PARTITIONS 10 */;
28EOF30EOF
2931
30# Force a checkpoint32force_checkpoint
31stop_server
32start_server --innodb_file_per_table
3333
34# Test that specifying partitions with --include works34# Test that specifying partitions with --include works
35innobackupex --no-timestamp --include='^test.*#P#p5' $topdir/backup35innobackupex --no-timestamp --include='^test.*#P#p5' $topdir/backup
3636
=== 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:34 +0000
@@ -1,6 +1,8 @@
1. inc/common.sh1. inc/common.sh
22
3start_server --innodb_file_per_table3MYSQLD_EXTRA_MY_CNF_OPTS="innodb-file-per-table"
4
5start_server
4load_dbase_schema incremental_sample6load_dbase_schema incremental_sample
57
6# Backup dir8# Backup dir
@@ -15,8 +17,7 @@
15FLUSH LOGS;17FLUSH LOGS;
16EOF18EOF
1719
18stop_server20force_checkpoint
19start_server --innodb_file_per_table
2021
21vlog "Making incremental backup"22vlog "Making incremental backup"
22innobackupex --incremental --no-timestamp --incremental-basedir=$topdir/backup/full $topdir/backup/delta23innobackupex --incremental --no-timestamp --incremental-basedir=$topdir/backup/full $topdir/backup/delta
@@ -42,6 +43,6 @@
42cd $topdir43cd $topdir
4344
44vlog "Data restored"45vlog "Data restored"
45start_server --innodb_file_per_table46start_server
4647
47run_cmd $MYSQL $MYSQL_ARGS -e "SELECT * FROM t" test48run_cmd $MYSQL $MYSQL_ARGS -e "SELECT * FROM t" test
4849
=== 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:34 +0000
@@ -10,8 +10,7 @@
10load_dbase_data sakila10load_dbase_data sakila
1111
12# Force a checkpoint12# Force a checkpoint
13stop_server13force_checkpoint
14start_server
1514
16# Copy some .ibd files to a temporary location and replace them with symlinks15# Copy some .ibd files to a temporary location and replace them with symlinks
1716

Subscribers

People subscribed via source and target branches