diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-06 14:38:03 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-09 09:28:00 -0500 |
commit | 7ec655850397a0edfcea8c1fd82650824297e564 (patch) | |
tree | ee9eee5fa9fe5205a7e3950327c17afe93d2cd2a /cmake/configure.pl | |
parent | d6b430c91b6ef6acd0b5adab6106915599c1abcc (diff) | |
download | mariadb-git-7ec655850397a0edfcea8c1fd82650824297e564.tar.gz |
MDEV-9021: MYSQLD SEGFAULTS WHEN BUILT USING --WITH-MAX-INDEXES=128
The bitmap implementation defines two template Bitmap classes. One
optimized for 64-bit (default) wide bitmaps while the other is used for
all other widths.
In order to optimize the computations, Bitmap<64> class has defined its
own member functions for bitmap operations, the other one, however,
relies on mysys' bitmap implementation (mysys/my_bitmap.c).
Issue 1:
In case of non 64-bit Bitmap class, intersect() wrongly reset the
received bitmap while initialising a new local bitmap structure
(bitmap_init() clears the bitmap buffer) thus, the received bitmap was
getting cleared.
Fixed by initializing the local bitmap structure by using a temporary
buffer and later copying the received bitmap to the initialised bitmap
structure.
Issue 2:
The non 64-bit Bitmap class had the Iterator missing which caused
compilation failure.
Also added a cmake variable to hold the MAX_INDEXES value when supplied
from the command prompt. (eg. cmake .. -DMAX_INDEXES=128U). Checks have
been put in place to trigger build failure if MAX_INDEXES value is
greater than 128.
Test modifications:
* Introduced include/have_max_indexes_[64|128].inc to facilitate
skipping of tests for which the output differs with different
MAX_INDEXES.
* Introduced include/max_indexes.inc which would get modified by cmake
to reflect the MAX_INDEXES value used to build the server. This file
simply sets an mtr variable '$max_indexes' to show the MAX_INDEXES
value, which will then be consumed by the above introduced include file.
* Some tests (portions), dependent on MAX_INDEXES value, have been moved
to separate test files.
Diffstat (limited to 'cmake/configure.pl')
-rw-r--r-- | cmake/configure.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index d9ca3f34e59..b298ab11076 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -232,6 +232,11 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DENABLE_GCOV=ON"; next; } + if ($option =~ /with-max-indexes=/) + { + $cmakeargs = $cmakeargs." -DMAX_INDEXES=".substr($option, 17); + next; + } if ($option =~ /verbose/) { $cmakeargs = $cmakeargs." -DCMAKE_VERBOSE_MAKEFILE=1"; |