diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
| commit | f900b6581021d119376660e6a65166cd74de0a5d (patch) | |
| tree | 6e8a3e15bb0980c034b6b2092fee3b9d6bd5d237 /config | |
| parent | 721a6a6a6d3de10d24396ba96d6b8a013080f843 (diff) | |
| download | mariadb-git-f900b6581021d119376660e6a65166cd74de0a5d.tar.gz | |
Merge of innodb_plugin for MySQL 5.1.53 with xtradb
Fixed compiler warnings in xtradb
Added back resetting of null bitmap but now in row_search_for_mysql()
storage/xtradb/row/row0sel.c:
Added back resetting of null bitmap but now in row_search_for_mysql()
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/maintainer.m4 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/ac-macros/maintainer.m4 b/config/ac-macros/maintainer.m4 index fd82786dbed..e18be27ce02 100644 --- a/config/ac-macros/maintainer.m4 +++ b/config/ac-macros/maintainer.m4 @@ -8,10 +8,8 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ [AS_HELP_STRING([--enable-mysql-maintainer-mode], [Enable a MySQL maintainer-specific development environment])], [USE_MYSQL_MAINTAINER_MODE=$enableval], - [USE_MYSQL_MAINTAINER_MODE=no]) -# Remove the # from following comments after merge with xtradb for 5.1.53 -# [AS_IF([test "$with_debug" != "no"], -# [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])]) + [AS_IF([test "$with_debug" != "no"], + [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])]) AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE]) ]) |