Merge lp:~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Automerge + implementation of

Fix bug 1182049 (Make innochecksum fully use InnoDB headers) by
removing PAGE_ZIP_MIN_SIZE and the various DICT_TF_* defines from
innochecksum.cc and using DICT_TF_HAS_ATOMIC_BLOBS instead.

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

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'extra/innochecksum.cc'
--- extra/innochecksum.cc	2014-02-17 11:12:40 +0000
+++ extra/innochecksum.cc	2014-07-23 04:01:43 +0000
@@ -52,17 +52,6 @@
 #include "mach0data.h"           /* mach_read_from_4() */
 #include "ut0crc32.h"            /* ut_crc32_init() */
 
-/** Smallest compressed page size */
-#define PAGE_ZIP_MIN_SIZE       (1 << 10)
-
-#define DICT_TF_FORMAT_SHIFT            5       /* file format */
-#define DICT_TF_FORMAT_MASK                                             \
-    ((~(~0 << (DICT_TF_BITS - DICT_TF_FORMAT_SHIFT))) << DICT_TF_FORMAT_SHIFT)
-#define DICT_TF_FORMAT_51               0       /*!< InnoDB/MySQL up to 5.1 */
-#define DICT_TF_FORMAT_ZIP              1       /*!< InnoDB plugin for 5.1:
-                                                  compressed tables,
-                                                  new BLOB treatment */
-
 #ifdef UNIV_NONINL
 # include "fsp0fsp.ic"
 # include "mach0data.ic"
@@ -324,14 +313,13 @@
   }
   else if (page_type == FIL_PAGE_TYPE_FSP_HDR)
   {
-    ulint format = flags & DICT_TF_FORMAT_MASK >> DICT_TF_FORMAT_SHIFT;
     ulint zip_size = fsp_flags_get_zip_size(flags);
 
     if (!flags)
     {
       printf("Detected file format: Antelope (5.1.7 or newer).\n");
     }
-    else if (format == DICT_TF_FORMAT_ZIP)
+    else if (DICT_TF_HAS_ATOMIC_BLOBS(flags))
     {
       printf("Detected file format: Barracuda ");
       if (!zip_size)
@@ -340,7 +328,7 @@
         printf("(compressed with KEY_BLOCK_SIZE=%lu).\n", zip_size);
     }
     else
-      printf("Unknown file format: %lu\n", format);
+      printf("Unknown file format flags: %lu\n", flags);
   }
   else
   {
 
=== modified file 'sql/handler.h'
--- sql/handler.h	2014-06-23 12:07:10 +0000
+++ sql/handler.h	2014-07-23 04:01:43 +0000
@@ -37,10 +37,6 @@
 
 class Alter_info;
 
-#if MAX_KEY > 128
-#error MAX_KEY is too large.  Values up to 128 are supported.
-#endif
-
 // the following is for checking tables
 
 #define HA_ADMIN_ALREADY_DONE	  1
 
=== modified file 'sql/sql_show.cc'
--- sql/sql_show.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_show.cc	2014-07-23 04:01:43 +0000
@@ -1196,8 +1196,6 @@
 }
 
 
-#define LIST_PROCESS_HOST_LEN 64
-
 /**
   Print "ON UPDATE" clause of a field into a string.
 
 
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- storage/innobase/handler/ha_innodb.cc	2014-06-04 14:48:06 +0000
+++ storage/innobase/handler/ha_innodb.cc	2014-07-23 04:01:43 +0000
@@ -11383,16 +11383,6 @@
 	return(innobase_buffer_pool_size);
 }
 
-UNIV_INTERN
-bool
-ha_innobase::is_corrupt() const
-{
-	if (share->ib_table)
-		return ((bool)share->ib_table->is_corrupt);
-	else
-		return (FALSE);
-}
-
 /*********************************************************************//**
 Calculates the key number used inside MySQL for an Innobase index. We will
 first check the "index translation table" for a match of the index to get
 
=== modified file 'storage/innobase/handler/ha_innodb.h'
--- storage/innobase/handler/ha_innodb.h	2014-06-04 14:48:06 +0000
+++ storage/innobase/handler/ha_innodb.h	2014-07-23 04:01:43 +0000
@@ -130,7 +130,6 @@
 	double read_time(uint index, uint ranges, ha_rows rows);
 	longlong get_memory_buffer_size() const;
 	my_bool is_fake_change_enabled(THD *thd);
-	bool is_corrupt() const;
 
 	int write_row(uchar * buf);
 	int update_row(const uchar * old_data, uchar * new_data);