mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix AIX error during compile in my_handler (pointer to data is used, while pointer to function is expected).

Browse source 
This also has generated warnings on all other platforms
This commit is contained in:
Vladislav Vaintroub 2010-01-19 18:22:51 +01:00
commit 3db12ce6b6
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure.cmake
View file

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

6
mysys/my_handler.c
View file

@ -576,6 +576,10 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
will ignore calls to register already registered error numbers. 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) 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) == compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
HA_ERR_LAST + 1); 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); HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
} }