Merge lp:~percona-core/percona-server/release-5.1.66-14.2 into lp:percona-server/5.1

[Stewart Smith]

Changes for 5.1.66-14.2

[Laurynas Biveinis (laurynas-biveinis)]

This MP might be missing a prerequisite branch

review: Needs Information

[Stewart Smith (stewart)]

approved (this is just simple merge when merged with --weave)

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

But merge conflicts?

review: Needs Fixing

[Stewart Smith (stewart)]

Laurynas Biveinis <email address hidden> writes:
> Review: Needs Fixing
>
> But merge conflicts?

But none with --weave merge method. One of those wonderful strange things.

--
Stewart Smith

=== modified file 'Makefile'
--- Makefile	2012-10-16 04:49:59 +0000
+++ Makefile	2013-01-18 03:25:31 +0000
@@ -1,5 +1,10 @@
+<<<<<<< TREE
 MYSQL_VERSION=5.1.66
 PERCONA_SERVER_VERSION=rel14.1
+=======
+MYSQL_VERSION=5.1.66
+PERCONA_SERVER_VERSION=rel14.2
+>>>>>>> MERGE-SOURCE
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
=== modified file 'Percona-Server/storage/innodb_plugin/log/log0online.c'
--- Percona-Server/storage/innodb_plugin/log/log0online.c	2013-01-04 07:28:01 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0online.c	2013-01-18 03:25:31 +0000
@@ -385,6 +385,7 @@
 #endif
 }
 
+<<<<<<< TREE
 /*********************************************************************//**
 Check if missing, if any, LSN interval can be read and tracked using the
 current LSN value, the LSN value where the tracking stopped, and the log group
@@ -416,6 +417,39 @@
 }
 
 
+=======
+/*********************************************************************//**
+Check if missing, if any, LSN interval can be read and tracked using the
+current LSN value, the LSN value where the tracking stopped, and the log group
+capacity.
+
+@return TRUE if the missing interval can be tracked or if there's no missing
+data.  */
+static
+ibool
+log_online_can_track_missing(
+/*=========================*/
+	ib_uint64_t	last_tracked_lsn,	/*!<in: last tracked LSN */
+	ib_uint64_t	tracking_start_lsn)	/*!<in:	current LSN */
+{
+	/* last_tracked_lsn might be < MIN_TRACKED_LSN in the case of empty
+	bitmap file, handle this too. */
+	last_tracked_lsn = ut_max(last_tracked_lsn, MIN_TRACKED_LSN);
+
+	if (last_tracked_lsn > tracking_start_lsn) {
+		fprintf(stderr,
+			"InnoDB: Error: last tracked LSN is in future.  This "
+			"can be caused by mismatched bitmap files.\n");
+		exit(1);
+	}
+
+	return (last_tracked_lsn == tracking_start_lsn)
+		|| (log_sys->lsn - last_tracked_lsn
+		    <= log_sys->log_group_capacity);
+}
+
+
+>>>>>>> MERGE-SOURCE
 /****************************************************************//**
 Diagnose a gap in tracked LSN range on server startup due to crash or
 very fast shutdown and try to close it by tracking the data
@@ -431,11 +465,19 @@
 {
 	ut_ad(last_tracked_lsn != tracking_start_lsn);
 
+<<<<<<< TREE
 	fprintf(stderr, "InnoDB: last tracked LSN in \'%s\' is %llu, but the "
 		"last checkpoint LSN is %llu.  This might be due to a server "
 		"crash or a very fast shutdown.  ", log_bmp_sys->out.name,
 		last_tracked_lsn, tracking_start_lsn);
 
+=======
+	fprintf(stderr, "InnoDB: last tracked LSN is %llu, but the last "
+		"checkpoint LSN is %llu.  This might be due to a server "
+		"crash or a very fast shutdown.  ", last_tracked_lsn,
+		tracking_start_lsn);
+
+>>>>>>> MERGE-SOURCE
 	/* See if we can fully recover the missing interval */
 	if (log_online_can_track_missing(last_tracked_lsn,
 					 tracking_start_lsn)) {
@@ -443,8 +485,13 @@
 		fprintf(stderr,
 			"Reading the log to advance the last tracked LSN.\n");
 
+<<<<<<< TREE
 		log_bmp_sys->start_lsn = ut_max_uint64(last_tracked_lsn,
 						       MIN_TRACKED_LSN);
+=======
+		log_bmp_sys->start_lsn = ut_max(last_tracked_lsn,
+						MIN_TRACKED_LSN);
+>>>>>>> MERGE-SOURCE
 		log_set_tracked_lsn(log_bmp_sys->start_lsn);
 		log_online_follow_redo_log();
 		ut_ad(log_bmp_sys->end_lsn >= tracking_start_lsn);
@@ -560,10 +607,17 @@
 {
 	ibool		success;
 	ib_uint64_t	tracking_start_lsn
+<<<<<<< TREE
 		= ut_max_uint64(log_sys->last_checkpoint_lsn, MIN_TRACKED_LSN);
 	os_file_dir_t	bitmap_dir;
 	os_file_stat_t	bitmap_dir_file_info;
 	ib_uint64_t	last_file_start_lsn	= MIN_TRACKED_LSN;
+=======
+		= ut_max(log_sys->last_checkpoint_lsn, MIN_TRACKED_LSN);
+	os_file_dir_t	bitmap_dir;
+	os_file_stat_t	bitmap_dir_file_info;
+	ib_uint64_t	last_file_start_lsn	= MIN_TRACKED_LSN;
+>>>>>>> MERGE-SOURCE
 
 	/* Assert (could be compile-time assert) that bitmap data start and end
 	in a bitmap block is 8-byte aligned */

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-01-17 23:03:41 +0000
+++ build/debian/rules	2013-01-18 03:25:31 +0000
@@ -9,7 +9,11 @@
 TMP=$(CURDIR)/debian/tmp/
 
 major_version_default=14
+<<<<<<< TREE
 minor_version_default=1
+=======
+minor_version_default=2
+>>>>>>> MERGE-SOURCE
 
 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-01-17 23:03:41 +0000
+++ build/percona-server.spec	2013-01-18 03:25:31 +0000
@@ -16,7 +16,11 @@
 %define community 1
 %define mysqlversion 5.1.66
 %define majorversion 14
+<<<<<<< TREE
 %define minorversion 1
+=======
+%define minorversion 2
+>>>>>>> MERGE-SOURCE
 %define distribution  rhel%{redhatversion}
 %define release       rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
 

=== modified file 'doc/source/conf.py'
=== modified file 'doc/source/diagnostics/slow_extended.rst'
--- doc/source/diagnostics/slow_extended.rst	2013-01-15 08:26:36 +0000
+++ doc/source/diagnostics/slow_extended.rst	2013-01-18 03:25:31 +0000
@@ -8,7 +8,11 @@
 
 The ability to log queries with microsecond precision is essential for measuring the work the |MySQL| server performs. The standard slow query log in |MySQL| 5.0 has only 1-second granularity, which is too coarse for all but the slowest queries. |MySQL| 5.1 has microsecond resolution, but does not have the extra information about query execution that is included in the |Percona Server|.
 
+<<<<<<< TREE
 You can use *Percona Toolkit*'s `pt-query-digest <http://www.percona.com/doc/percona-toolkit/2.1/pt-query-digest.html>`_ tool to aggregate similar queries together and report on those that consume the most execution time.
+=======
+You can use *Percona Toolkit*'s ''pt-query-digest'' tool to aggregate similar queries together and report on those that consume the most execution time.
+>>>>>>> MERGE-SOURCE
 
 
 Version Specific Information
@@ -145,7 +149,10 @@
      :conf: Yes
      :scope: Global, session
      :dyn: Yes
+<<<<<<< TREE
      :default: microtime
+=======
+>>>>>>> MERGE-SOURCE
 
 Specifies how much information to include in your slow log. The value is a comma-delimited string, and can contain any combination of the following values: