Merge lp:~sergei.glushchenko/percona-server/ps55-128-max-index into lp:percona-server/5.5

[Sergei Glushchenko]

This is a port from
http://bazaar.launchpad.net/~percona-core/percona-server/rnt-5.1/revision/166

Been tested locally and the only failed tests were
main.create
main.ps_1general
main.ps_2myisam
main.ps_4heap
main.ps_5merge
main.ps_3innodb

which are designed with the assumption that MAX_INDEXES=64.

[Sergei Glushchenko (sergei.glushchenko)]

#25824

[Alexey Kopytov (akopytov)]

As discussed on IRC we should look into making the failing test cases pass (or be skipped) with all --with-max-indexes values.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

And add a CMake option to control the max. index limit for 5.5.

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

include/have_64_keys.inc been added to check whether we have exactly 64 max indexes or not. If we have not
main.create
main.ps_1general
main.ps_2myisam
main.ps_4heap
main.ps_5merge
main.ps_3innodb
are skipped.

Also MAX_INDEXES=N option been added to cmake to produce build with non-default MAX_INDEXES value.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/490/

More than a half of debug Jenkins builds are failed because of known issue in upstream MySQL. This is reported in http://bugs.mysql.com/bug.php?id=65946, https://bugs.launchpad.net/percona-server/+bug/1050758.

[Laurynas Biveinis (laurynas-biveinis)]

Same comments as for 5.1.

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Branch is updated now.

[Alexey Kopytov (akopytov)]

Sergei,

Can you add a docstring for the MAX_INDEXES option, so it appears in "cmake -L .", "cmake -LH .", etc?

You can copy it from the autoconf macro in 5.1: "Sets the maximum number of indexes per table, default 64".

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

> Sergei,
>
> Can you add a docstring for the MAX_INDEXES option, so it appears in "cmake -L
> .", "cmake -LH .", etc?
>
> You can copy it from the autoconf macro in 5.1: "Sets the maximum number of
> indexes per table, default 64".
Done.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2012-04-19 16:51:34 +0000
+++ Percona-Server/CMakeLists.txt	2012-09-26 13:24:24 +0000
@@ -202,6 +202,11 @@
 OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF)
 MARK_AS_ADVANCED(WITH_FAST_MUTEXES)
 
+IF (NOT MAX_INDEXES)
+  SET(MAX_INDEXES 64)
+ENDIF()
+SET(MAX_INDEXES ${MAX_INDEXES} CACHE STRING "Sets the maximum number of indexes per table, default 64")
+
 # Set DBUG_OFF and other optional release-only flags for non-debug project types
 FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
   FOREACH(LANG C CXX)
 
=== modified file 'Percona-Server/config.h.cmake'
--- Percona-Server/config.h.cmake	2011-08-09 08:03:29 +0000
+++ Percona-Server/config.h.cmake	2012-09-26 13:24:24 +0000
@@ -381,7 +381,7 @@
 
 #cmakedefine HAVE_MBSTATE_T
 
-#define MAX_INDEXES 64
+#cmakedefine MAX_INDEXES @MAX_INDEXES@
 
 #cmakedefine QSORT_TYPE_IS_VOID 1
 #cmakedefine RETQSORTTYPE @RETQSORTTYPE@
 
=== added file 'Percona-Server/mysql-test/include/have_64_keys.inc'
--- Percona-Server/mysql-test/include/have_64_keys.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_64_keys.inc	2012-09-26 13:24:24 +0000
@@ -0,0 +1,12 @@
+# Check that we have MAX_INDEXES=64
+
+--require r/have_64_keys.require
+
+# Check that maximum length of possible_keys and key_len fields is 4096
+# They are defined in THD::send_explain_fields as NAME_CHAR_LEN*MAX_KEY
+# where NAME_CHAR_LEN is always 64 (mysql_com.h) and MAX_KEY is
+# a synonym of MAX_INDEXES
+
+--enable_metadata
+EXPLAIN SELECT 1;
+--disable_metadata
 
=== added file 'Percona-Server/mysql-test/r/have_64_keys.require'
--- Percona-Server/mysql-test/r/have_64_keys.require	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/have_64_keys.require	2012-09-26 13:24:24 +0000
@@ -0,0 +1,14 @@
+EXPLAIN SELECT 1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					id	8	3	1	N	32929	0	63
+def					select_type	253	19	6	N	1	31	8
+def					table	253	64	0	Y	0	31	8
+def					type	253	10	0	Y	0	31	8
+def					possible_keys	253	4096	0	Y	0	31	8
+def					key	253	64	0	Y	0	31	8
+def					key_len	253	4096	0	Y	0	31	8
+def					ref	253	1024	0	Y	0	31	8
+def					rows	8	10	0	Y	32928	0	63
+def					Extra	253	255	14	N	1	31	8
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 
=== modified file 'Percona-Server/mysql-test/t/create.test'
--- Percona-Server/mysql-test/t/create.test	2012-04-18 23:26:28 +0000
+++ Percona-Server/mysql-test/t/create.test	2012-09-26 13:24:24 +0000
@@ -2,6 +2,11 @@
 # Check some special create statements.
 #
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t5;
 drop database if exists mysqltest;
 
=== modified file 'Percona-Server/mysql-test/t/ps_1general.test'
--- Percona-Server/mysql-test/t/ps_1general.test	2009-11-04 12:28:20 +0000
+++ Percona-Server/mysql-test/t/ps_1general.test	2012-09-26 13:24:24 +0000
@@ -4,6 +4,11 @@
 #                                                            #
 ##############################################################
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 #    
 # NOTE: PLEASE SEE THE DETAILED DESCRIPTION AT THE BOTTOM OF THIS FILE
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
=== modified file 'Percona-Server/mysql-test/t/ps_2myisam.test'
--- Percona-Server/mysql-test/t/ps_2myisam.test	2005-07-28 00:22:47 +0000
+++ Percona-Server/mysql-test/t/ps_2myisam.test	2012-09-26 13:24:24 +0000
@@ -4,6 +4,11 @@
 #                                             #
 ###############################################
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 #    
 # NOTE: PLEASE SEE ps_1general.test (bottom) 
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
=== modified file 'Percona-Server/mysql-test/t/ps_3innodb.test'
--- Percona-Server/mysql-test/t/ps_3innodb.test	2010-07-04 07:30:04 +0000
+++ Percona-Server/mysql-test/t/ps_3innodb.test	2012-09-26 13:24:24 +0000
@@ -4,6 +4,11 @@
 #                                             #
 ###############################################
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 #    
 # NOTE: PLEASE SEE ps_1general.test (bottom) 
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
=== modified file 'Percona-Server/mysql-test/t/ps_4heap.test'
--- Percona-Server/mysql-test/t/ps_4heap.test	2005-07-28 14:09:54 +0000
+++ Percona-Server/mysql-test/t/ps_4heap.test	2012-09-26 13:24:24 +0000
@@ -4,6 +4,11 @@
 #                                             #
 ###############################################
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 #    
 # NOTE: PLEASE SEE ps_1general.test (bottom) 
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
=== modified file 'Percona-Server/mysql-test/t/ps_5merge.test'
--- Percona-Server/mysql-test/t/ps_5merge.test	2005-07-28 14:09:54 +0000
+++ Percona-Server/mysql-test/t/ps_5merge.test	2012-09-26 13:24:24 +0000
@@ -4,6 +4,11 @@
 #                                             #
 ###############################################
 
+# This test checks some limits which are related to MAX_INDEXES constant
+# which could be set to non-default value at build time.
+# We just skip the test in this case.
+--source include/have_64_keys.inc
+
 #    
 # NOTE: PLEASE SEE ps_1general.test (bottom) 
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
=== modified file 'Percona-Server/mysys/my_bitmap.c'
--- Percona-Server/mysys/my_bitmap.c	2011-07-03 23:48:19 +0000
+++ Percona-Server/mysys/my_bitmap.c	2012-09-26 13:24:24 +0000
@@ -294,7 +294,7 @@
   m+= prefix_bytes;
   if ((prefix_bits= prefix_size & 7))
     *(m++)= (1 << prefix_bits)-1;
-  if ((d= no_bytes_in_map(map)-prefix_bytes))
+  if ((d= no_bytes_in_map(map) - (m - (uchar *) map->bitmap)))
     bzero(m, d);
 }
 
 
=== modified file 'Percona-Server/sql/sql_bitmap.h'
--- Percona-Server/sql/sql_bitmap.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/sql/sql_bitmap.h	2012-09-26 13:24:24 +0000
@@ -51,7 +51,11 @@
   void intersect(ulonglong map2buff)
   {
     MY_BITMAP map2;
-    bitmap_init(&map2, (uint32 *)&map2buff, sizeof(ulonglong)*8, 0);
+    ulonglong buf;
+
+    /* bitmap_init() zeroes the supplied buffer */
+    bitmap_init(&map2, (uint32 *)&buf, sizeof(ulonglong)*8, 0);
+    buf= map2buff;
     bitmap_intersect(&map, &map2);
   }
   /* Use highest bit for all bits above sizeof(ulonglong)*8. */
@@ -91,9 +95,9 @@
   ulonglong to_ulonglong() const
   {
     if (sizeof(buffer) >= 8)
-      return uint8korr(buffer);
+      return uint8korr((uchar *) buffer);
     DBUG_ASSERT(sizeof(buffer) >= 4);
-    return (ulonglong) uint4korr(buffer);
+    return (ulonglong) uint4korr((uchar *) buffer);
   }
 };