Merge

client/mysqltest.cc

@@ -73,7 +73,7 @@
 #define QUERY_REAP_FLAG  2
 
 #ifndef HAVE_SETENV
-static int setenv(const char *name, const char *value, int overwrite)
+static int setenv(const char *name, const char *value, int overwrite);
 #endif
 
 enum {

configure.cmake

@@ -285,11 +285,11 @@ IF(UNIX)
     MY_SEARCH_LIBS(__infinity m LIBM)
   ENDIF()
   
-  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-   # On  Solaris, use of intrinsics will screw the lib search logic
-   # Force using -lm, so rint etc are found.
-   SET(LIBM m)
-  ENDIF()
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+   # On  Solaris, use of intrinsics will screw the lib search logic
+   # Force using -lm, so rint etc are found.
+   SET(LIBM m)
+  ENDIF()
 
   MY_SEARCH_LIBS(gethostbyname_r  "nsl_r;nsl" LIBNSL)
   MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)

mysys/my_handler.c

@@ -576,6 +576,10 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
     will ignore calls to register already registered error numbers.
 */
 
+static const char **get_handler_error_messages()
+{
+  return handler_error_messages;
+}
 
 void my_handler_error_register(void)
 {
@@ -587,7 +591,7 @@ void my_handler_error_register(void)
   */
   compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
                       HA_ERR_LAST + 1);
-  my_error_register(handler_error_messages, HA_ERR_FIRST,
+  my_error_register(get_handler_error_messages, HA_ERR_FIRST,
                     HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
 }