Merge lp:~laurynas-biveinis/percona-server/bug1105709-5.1 into lp:percona-server/5.1

[Laurynas Biveinis]

Fix bug 1105709 and bug 1111144.
BT 16274
http://jenkins.percona.com/job/percona-server-5.1-param/514/

[George Ormond Lorch III (gl-az)]

Minor comment spelling on diff line 161 /shoul/should

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

Will fix, thanks.

[Stewart Smith (stewart)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Fixed.

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_flush.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_flush.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_flush.result	2013-02-06 09:06:26 +0000
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS t1;
+RESET CHANGED_PAGE_BITMAPS;
+CREATE TABLE t1 (a INT, b BLOB) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1, REPEAT("a", 20000));
+ib_modified_log_1
+INSERT INTO t1 VALUES (2, REPEAT("b", 20000));
+ib_modified_log_1
+ib_modified_log_2
+INSERT INTO t1 VALUES (3, REPEAT("c", 20000));
+ib_modified_log_1
+ib_modified_log_2
+ib_modified_log_3
+INSERT INTO t1 VALUES (4, REPEAT("d", 20000));
+ib_modified_log_1
+ib_modified_log_2
+ib_modified_log_3
+ib_modified_log_4
+RESET CHANGED_PAGE_BITMAPS;
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_flush.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_flush.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_flush.test	2013-02-06 09:06:26 +0000
@@ -0,0 +1,93 @@
+#
+# Test the interaction between innodb_flush_method and bitmap file writes
+#
+--source include/not_windows.inc
+--source include/have_innodb_plugin.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $BITMAP_FILE= $MYSQLD_DATADIR/ib_modified_log_1_0.xdb;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+RESET CHANGED_PAGE_BITMAPS;
+
+CREATE TABLE t1 (a INT, b BLOB) ENGINE=InnoDB;
+
+#
+# Test innodb_flush_method=fdatasync (the default)
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart:--innodb-track-changed-pages=1" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (1, REPEAT("a", 20000));
+
+#
+# Test innodb_flush_method=O_DSYNC
+# Check that the previous test produced bitmap data while the server is down.
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+file_exists $BITMAP_FILE;
+# Here and below remove the LSNs from the file names on listing them
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+--enable_reconnect
+--exec echo "restart:--innodb-track-changed-pages=1 --innodb-flush-method=O_DSYNC" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (2, REPEAT("b", 20000));
+
+#
+# Test innodb_flush_method=O_DIRECT
+# Check that the previous test produced bitmap data while the server is down.
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+--enable_reconnect
+--exec echo "restart:--innodb-track-changed-pages=1 --innodb-flush-method=O_DIRECT" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (3, REPEAT("c", 20000));
+
+#
+# Test innodb_flush_method=O_DIRECT
+# Check that the previous test produced bitmap data while the server is down.
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+--enable_reconnect
+--exec echo "restart:--innodb-track-changed-pages=1 --innodb-flush-method=O_DIRECT" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (4, REPEAT("d", 20000));
+
+#
+# Restart the server with default options
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+RESET CHANGED_PAGE_BITMAPS;
+DROP TABLE t1;

=== modified file 'Percona-Server/storage/innodb_plugin/log/log0online.c'
--- Percona-Server/storage/innodb_plugin/log/log0online.c	2013-02-06 09:06:26 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0online.c	2013-02-06 09:06:26 +0000
@@ -491,6 +491,23 @@
 }
 
 /*********************************************************************//**
+Check if an old file that has the name of a new bitmap file we are about to
+create should be overwritten.  */
+static
+ibool
+log_online_should_overwrite(
+/*========================*/
+	const char	*path)	/*!< in: path to file */
+{
+	ibool		success;
+	os_file_stat_t	file_info;
+
+	/* Currently, it's OK to overwrite 0-sized files only */
+	success = os_file_get_status(path, &file_info);
+	return success && file_info.size == 0LL;
+}
+
+/*********************************************************************//**
 Create a new empty bitmap output file.
 
 @return TRUE if operation succeeded, FALSE if I/O error */
@@ -499,11 +516,21 @@
 log_online_start_bitmap_file(void)
 /*==============================*/
 {
-	ibool	success;
-
-	log_bmp_sys->out.file
-		= os_file_create(log_bmp_sys->out.name, OS_FILE_OVERWRITE,
-				 OS_FILE_NORMAL, OS_DATA_FILE, &success);
+	ibool	success	= TRUE;
+
+	/* Check for an old file that should be deleted first */
+	if (log_online_should_overwrite(log_bmp_sys->out.name)) {
+		success = os_file_delete(log_bmp_sys->out.name);
+	}
+
+	if (UNIV_LIKELY(success)) {
+		log_bmp_sys->out.file
+			= os_file_create_simple_no_error_handling(
+							log_bmp_sys->out.name,
+							OS_FILE_CREATE,
+							OS_FILE_READ_WRITE,
+							&success);
+	}
 	if (UNIV_UNLIKELY(!success)) {
 
 		/* The following call prints an error message */
@@ -1071,6 +1098,11 @@
 		return FALSE;
 	}
 
+#ifdef UNIV_LINUX
+	posix_fadvise(log_bmp_sys->out.file, log_bmp_sys->out.offset,
+		      MODIFIED_PAGE_BLOCK_SIZE, POSIX_FADV_DONTNEED);
+#endif
+
 	log_bmp_sys->out.offset += MODIFIED_PAGE_BLOCK_SIZE;
 	return TRUE;
 }