Merge lp:~laurynas-biveinis/percona-server/bug1202252-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Automerge from 5.5.

http://jenkins.percona.com/job/percona-server-5.6-param/637/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'mysql-test/suite/innodb/r/percona_changed_pages.result'
--- mysql-test/suite/innodb/r/percona_changed_pages.result	2013-05-29 10:06:41 +0000
+++ mysql-test/suite/innodb/r/percona_changed_pages.result	2014-07-08 18:35:23 +0000
@@ -48,6 +48,9 @@
 WHERE START_LSN >= END_LSN;
 COUNT(*)
 0
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN < 10 AND END_LSN > 20;
+space_id	page_id	start_lsn	end_lsn
 ICP tests (all should be 1):
 SELECT COUNT(*) = @cond_test_pages_count
 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
@@ -104,6 +107,20 @@
 SELECT COUNT(*) = @cond_test_pages_count
 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
 WHERE
+START_LSN > (@cond_test_max_start_lsn - 1) AND
+END_LSN <= @max_end_lsn;
+COUNT(*) = @cond_test_pages_count
+1
+SELECT COUNT(*) = @cond_test_pages_count
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+START_LSN >= @cond_test_max_start_lsn AND
+END_LSN < (@max_end_lsn + 1);
+COUNT(*) = @cond_test_pages_count
+1
+SELECT COUNT(*) = @cond_test_pages_count
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
 START_LSN >= @cond_test_max_start_lsn AND
 END_LSN >= @cond_test_max_start_lsn;
 COUNT(*) = @cond_test_pages_count
@@ -129,6 +146,55 @@
 END_LSN < @cond_test_max_lsn - 10;
 COUNT(*)
 0
+SELECT COUNT(*)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+START_LSN <= (@min_start_lsn - 1);
+COUNT(*)
+0
+SELECT COUNT(*)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+START_LSN < @min_start_lsn;
+COUNT(*)
+0
+SELECT COUNT(*)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+END_LSN > @max_end_lsn;
+COUNT(*)
+0
+SELECT COUNT(*)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+END_LSN >= (@max_end_lsn + 1);
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN = (@min_start_lsn - 1);
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN < @min_start_lsn OR END_LSN > @max_end_lsn;
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN <= (@min_start_lsn - 1) OR END_LSN > @max_end_lsn;
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN < @min_start_lsn OR END_LSN >= (@max_end_lsn + 1);
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN <= (@min_start_lsn - 1) OR END_LSN >= (@max_end_lsn + 1);
+COUNT(*)
+0
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE (START_LSN > @cond_test_max_lsn AND END_LSN < @cond_test_max_lsn)
+OR (START_LSN > @cond_test_max_lsn + 10 AND END_LSN < @cond_test_max_lsn - 10);
+COUNT(*)
+0
 SELECT @total_pages=@r1_r4_pages AS should_be_1;
 should_be_1
 1

=== modified file 'mysql-test/suite/innodb/t/percona_changed_pages.test'
--- mysql-test/suite/innodb/t/percona_changed_pages.test	2013-05-29 10:06:41 +0000
+++ mysql-test/suite/innodb/t/percona_changed_pages.test	2014-07-08 18:35:23 +0000
@@ -102,6 +102,10 @@
 # Gather data for condition pushdown testing not using conditions #
 ###################################################################
 --disable_result_log
+SET @min_start_lsn=
+        (SELECT MIN(start_lsn)
+                FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES);
+
 SET @max_end_lsn=
         (SELECT MAX(end_lsn)
                 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES);
@@ -142,6 +146,12 @@
   FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
   WHERE START_LSN >= END_LSN;
 
+# Test for https://bugs.launchpad.net/percona-server/+bug/1202252
+# and https://mariadb.atlassian.net/browse/MDEV-4791: ICP crashes for
+# start_lsn < X AND end_lsn > Y, if X < Y
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN < 10 AND END_LSN > 20;
+
 ######################################################
 # Check if condition pushdown doesn't break anything #
 ######################################################
@@ -195,6 +205,18 @@
 SELECT COUNT(*) = @cond_test_pages_count
   FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
   WHERE
+  START_LSN > (@cond_test_max_start_lsn - 1) AND
+  END_LSN <= @max_end_lsn;
+
+SELECT COUNT(*) = @cond_test_pages_count
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  START_LSN >= @cond_test_max_start_lsn AND
+  END_LSN < (@max_end_lsn + 1);
+  
+SELECT COUNT(*) = @cond_test_pages_count
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
   START_LSN >= @cond_test_max_start_lsn AND
   END_LSN >= @cond_test_max_start_lsn;
 
@@ -216,6 +238,48 @@
   WHERE
   START_LSN > @cond_test_max_lsn + 10 AND
   END_LSN < @cond_test_max_lsn - 10;
+
+SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  START_LSN <= (@min_start_lsn - 1);
+
+SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  START_LSN < @min_start_lsn;
+
+SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  END_LSN > @max_end_lsn;
+
+SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  END_LSN >= (@max_end_lsn + 1);
+      
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN = (@min_start_lsn - 1);
+
+# Queries from a MariaDB patch for https://mariadb.atlassian.net/browse/MDEV-4791
+# with various conditions that are not supported by ICP
+# All must return empty set
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN < @min_start_lsn OR END_LSN > @max_end_lsn;
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN <= (@min_start_lsn - 1) OR END_LSN > @max_end_lsn;
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN < @min_start_lsn OR END_LSN >= (@max_end_lsn + 1);
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN <= (@min_start_lsn - 1) OR END_LSN >= (@max_end_lsn + 1);
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE (START_LSN > @cond_test_max_lsn AND END_LSN < @cond_test_max_lsn)
+  OR (START_LSN > @cond_test_max_lsn + 10 AND END_LSN < @cond_test_max_lsn - 10);
   
 # Test the combination of ICP and bitmap file selection
 --disable_query_log
@@ -246,7 +310,7 @@
 SELECT @r1_r2_pages+@r2_r3_pages+@r3_r4_pages=@r1_r4_pages AS should_be_1;
 SELECT @r1_r2_pages+@r2_r3_pages=@r1_r3_pages AS should_be_1;
 SELECT @r2_r3_pages+@r3_r4_pages=@r2_r4_pages AS should_be_1;
-  
+
 ################################################
 # Check how limit for maximum rows count works #
 ################################################

=== modified file 'storage/innobase/log/log0online.cc'
--- storage/innobase/log/log0online.cc	2014-04-25 10:55:01 +0000
+++ storage/innobase/log/log0online.cc	2014-07-08 18:35:23 +0000
@@ -1584,6 +1584,17 @@
 {
 	ut_a(i);
 
+	if (UNIV_UNLIKELY(min_lsn > max_lsn)) {
+
+		/* Empty range */
+		i->in_files.count = 0;
+		i->in_files.files = NULL;
+		i->in.file = os_file_invalid;
+		i->page = NULL;
+		i->failed = FALSE;
+		return TRUE;
+	}
+
 	if (!log_online_setup_bitmap_file_range(&i->in_files, min_lsn,
 		max_lsn)) {