diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index d9f9f05ae97..ecfcbccd322 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -11,7 +11,7 @@ DEFS = -DEMBEDDED_LIBRARY INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client LIBS = @LIBS@ -LDADD = ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) mysqltest_SOURCES = mysqltest.c diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 82928434cc6..59e6239c1e7 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -1719,7 +1719,7 @@ mysql_dump_debug_info(MYSQL *mysql) DBUG_RETURN(simple_command(mysql,COM_DEBUG,"",0,0)); } -char * STDCALL +const char * STDCALL mysql_stat(MYSQL *mysql) { DBUG_ENTER("mysql_stat"); @@ -1744,14 +1744,14 @@ mysql_ping(MYSQL *mysql) } -char * STDCALL +const char * STDCALL mysql_get_server_info(MYSQL *mysql) { return((char*) mysql->server_version); } -char * STDCALL +const char * STDCALL mysql_get_host_info(MYSQL *mysql) { return(mysql->host_info); @@ -1764,10 +1764,10 @@ mysql_get_proto_info(MYSQL *mysql) return (mysql->protocol_version); } -char * STDCALL +const char * STDCALL mysql_get_client_info(void) { - return (char*) MYSQL_SERVER_VERSION; + return MYSQL_SERVER_VERSION; } @@ -1875,12 +1875,12 @@ uint STDCALL mysql_errno(MYSQL *mysql) return (mysql)->net.last_errno; } -char * STDCALL mysql_error(MYSQL *mysql) +const char * STDCALL mysql_error(MYSQL *mysql) { return (mysql)->net.last_error; } -char *STDCALL mysql_info(MYSQL *mysql) +const char *STDCALL mysql_info(MYSQL *mysql) { return (mysql)->info; } |