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

[Laurynas Biveinis]

Fix assorted minor issues discovered in the 5.6 porting and its code review.

673. By Laurynas Biveinis 14 hours ago
Fix bug 1182050 (Duplicate LIST_PROCESS_HOST_LEN definition) by
removing a copy from sql_show.cc, so that there is only one definition
and that upstream changes to it result in a merge conflict.

672. By Laurynas Biveinis 14 hours ago
Fix bug 1182072 (Unused ha_innobase::is_corrupt() method) by removing
it.

671. By Laurynas Biveinis 14 hours ago
Fix bug 1182046 (Unnecessary MAX_KEY <= 128 compile-time check in
userstat) by removing the check.

http://jenkins.percona.com/job/percona-server-5.5-param/1029/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'sql/handler.h'
--- sql/handler.h	2013-08-22 13:16:55 +0000
+++ sql/handler.h	2014-07-23 03:59:03 +0000
@@ -36,10 +36,6 @@
 #include <ft_global.h>
 #include <keycache.h>
 
-#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-03 13:14:25 +0000
+++ sql/sql_show.cc	2014-07-23 03:59:03 +0000
@@ -1062,8 +1062,6 @@
 }
 
 
-#define LIST_PROCESS_HOST_LEN 64
-
 static bool get_field_default_value(THD *thd, Field *timestamp_field,
                                     Field *field, String *def_value,
                                     bool quoted)

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- storage/innobase/handler/ha_innodb.cc	2014-03-27 15:42:21 +0000
+++ storage/innobase/handler/ha_innodb.cc	2014-07-23 03:59:03 +0000
@@ -8995,16 +8995,6 @@
 	return(ranges + (double) rows / (double) total_rows * time_for_scan);
 }
 
-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-03-27 15:42:21 +0000
+++ storage/innobase/handler/ha_innodb.h	2014-07-23 03:59:03 +0000
@@ -141,7 +141,6 @@
 	double scan_time();
 	double read_time(uint index, uint ranges, ha_rows rows);
 	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);