Merge of maria/5.5 into maria-5.5-galera.

bzr merge -r tag:mariadb-5.5.35 maria/5.5

6 files changed, 78 insertions, 43 deletions

diff --git a/include/handler_ername.h b/include/handler_ername.h
index 91780be553d..50f7f535806 100644
--- a/include/handler_ername.h
+++ b/include/handler_ername.h
@@ -78,3 +78,4 @@
 { "HA_ERR_ROW_NOT_VISIBLE", HA_ERR_ROW_NOT_VISIBLE, "" },
 { "HA_ERR_ABORTED_BY_USER", HA_ERR_ABORTED_BY_USER, "" },
 { "HA_ERR_DISK_FULL", HA_ERR_DISK_FULL, "" },
+{ "HA_ERR_INCOMPATIBLE_DEFINITION", HA_ERR_INCOMPATIBLE_DEFINITION, "" },
diff --git a/include/my_base.h b/include/my_base.h
index e072bb7e2b1..36c97d61cb9 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -466,7 +466,8 @@ enum ha_base_keytype {
 #define HA_ERR_ROW_NOT_VISIBLE    182
 #define HA_ERR_ABORTED_BY_USER    183
 #define HA_ERR_DISK_FULL          184
-#define HA_ERR_LAST               184    /* Copy of last error nr */
+#define HA_ERR_INCOMPATIBLE_DEFINITION 185
+#define HA_ERR_LAST               185    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_check_opt.h b/include/my_check_opt.h
new file mode 100644
index 00000000000..abd4f4a96a7
--- /dev/null
+++ b/include/my_check_opt.h
@@ -0,0 +1,73 @@
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+#ifndef _my_check_opt_h
+#define _my_check_opt_h
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+  All given definitions needed for MyISAM storage engine:
+  myisamchk.c or/and ha_myisam.cc or/and micheck.c
+  Some definitions are needed by the MySQL parser.
+*/
+
+#define T_AUTO_INC		(1UL << 0)
+#define T_AUTO_REPAIR		(1UL << 1)
+#define T_BACKUP_DATA		(1UL << 2)
+#define T_CALC_CHECKSUM		(1UL << 3)
+#define T_CHECK			(1UL << 4)
+#define T_CHECK_ONLY_CHANGED	(1UL << 5)
+#define T_CREATE_MISSING_KEYS	(1UL << 6)
+#define T_DESCRIPT		(1UL << 7)
+#define T_DONT_CHECK_CHECKSUM	(1UL << 8)
+#define T_EXTEND		(1UL << 9)
+#define T_FAST			(1UL << 10)
+#define T_FORCE_CREATE		(1UL << 11)
+#define T_FORCE_UNIQUENESS	(1UL << 12)
+#define T_INFO			(1UL << 13)
+/** CHECK TABLE...MEDIUM (the default) */
+#define T_MEDIUM		(1UL << 14)
+/** CHECK TABLE...QUICK */
+#define T_QUICK			(1UL << 15)
+#define T_READONLY		(1UL << 16)
+#define T_REP			(1UL << 17)
+#define T_REP_BY_SORT		(1UL << 18)
+#define T_REP_PARALLEL		(1UL << 19)
+#define T_RETRY_WITHOUT_QUICK	(1UL << 20)
+#define T_SAFE_REPAIR		(1UL << 21)
+#define T_SILENT		(1UL << 22)
+#define T_SORT_INDEX		(1UL << 23)
+#define T_SORT_RECORDS		(1UL << 24)
+#define T_STATISTICS		(1UL << 25)
+#define T_UNPACK		(1UL << 26)
+#define T_UPDATE_STATE		(1UL << 27)
+#define T_VERBOSE		(1UL << 28)
+#define T_VERY_SILENT		(1UL << 29)
+#define T_WAIT_FOREVER		(1UL << 30)
+#define T_WRITE_LOOP		(1UL << 31)
+#define T_ZEROFILL              (1ULL << 32)
+#define T_ZEROFILL_KEEP_LSN     (1ULL << 33)
+/** If repair should not bump create_rename_lsn */
+#define T_NO_CREATE_RENAME_LSN  (1ULL << 33)
+
+#define T_REP_ANY		(T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
+
+#ifdef	__cplusplus
+}
+#endif
+#endif
diff --git a/include/myisam.h b/include/myisam.h
index 83402fe660f..cbb5229dd8b 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "my_compare.h"
 #include <myisamchk.h>
 #include <mysql/plugin.h>
-
+#include <my_check_opt.h>
 /*
   Limit max keys according to HA_MAX_POSSIBLE_KEY; See myisamchk.h for details
 */
@@ -311,7 +311,6 @@ typedef struct st_mi_bit_buff
   uint error;
 } MI_BIT_BUFF;
 
-
 typedef struct st_sort_info
 {
   /* sync things */
diff --git a/include/myisamchk.h b/include/myisamchk.h
index 19c2bf47ddb..a09e53eb387 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.h
@@ -27,45 +27,6 @@
 #ifndef _myisamchk_h
 #define _myisamchk_h
 
-#define T_AUTO_INC              1
-#define T_AUTO_REPAIR           2		/* QQ to be removed */
-#define T_BACKUP_DATA           4
-#define T_CALC_CHECKSUM         8
-#define T_CHECK                 16
-#define T_CHECK_ONLY_CHANGED    32
-#define T_CREATE_MISSING_KEYS   64
-#define T_DESCRIPT              128
-#define T_DONT_CHECK_CHECKSUM   256
-#define T_EXTEND                512
-#define T_FAST                  (1L << 10)
-#define T_FORCE_CREATE          (1L << 11)
-#define T_FORCE_UNIQUENESS      (1L << 12)
-#define T_INFO                  (1L << 13)
-#define T_MEDIUM                (1L << 14)
-#define T_QUICK                 (1L << 15)
-#define T_READONLY              (1L << 16)
-#define T_REP                   (1L << 17)
-#define T_REP_BY_SORT           (1L << 18)
-#define T_REP_PARALLEL          (1L << 19)
-#define T_RETRY_WITHOUT_QUICK   (1L << 20)
-#define T_SAFE_REPAIR           (1L << 21)
-#define T_SILENT                (1L << 22)
-#define T_SORT_INDEX            (1L << 23)
-#define T_SORT_RECORDS          (1L << 24)
-#define T_STATISTICS            (1L << 25)
-#define T_UNPACK                (1L << 26)
-#define T_UPDATE_STATE          (1L << 27)
-#define T_VERBOSE               (1L << 28)
-#define T_VERY_SILENT           (1L << 29)
-#define T_WAIT_FOREVER          (1L << 30)
-#define T_WRITE_LOOP            ((ulong) 1L << 31)
-#define T_ZEROFILL              ((ulonglong) 1L << 32)
-#define T_ZEROFILL_KEEP_LSN     ((ulonglong) 1L << 33)
-/** If repair should not bump create_rename_lsn */
-#define T_NO_CREATE_RENAME_LSN  ((ulonglong) 1L << 33)
-
-#define T_REP_ANY               (T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
-
 /*
   Flags used by xxxxchk.c or/and ha_xxxx.cc that are NOT passed
   to xxxcheck.c follows:
diff --git a/include/mysql/service_logger.h b/include/mysql/service_logger.h
index a84c4a4f2ee..962ab2fbc0b 100644
--- a/include/mysql/service_logger.h
+++ b/include/mysql/service_logger.h
@@ -80,7 +80,7 @@ extern struct logger_service_st {
 #define logger_rotate(log) (logger_service->rotate(log))
 #define logger_vprintf(log, fmt, argptr) (logger_service->\
     vprintf(log, fmt, argptr))
-#define logger_printf logger_service->printf
+#define logger_printf (*logger_service->printf)
 #define logger_write(log, buffer, size) \
   (logger_service->write(log, buffer, size))
 #else