mirror of
https://github.com/MariaDB/server.git
synced 2025-06-13 13:01:51 +03:00
Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated. Docs/manual.texi: Cleanup acinclude.m4: Search after openssl in /usr/local client/mysql.cc: Fix prompt client/mysqladmin.c: Cleanup client/mysqltest.c: Cleanup include/my_pthread.h: Move thread variables to the right location include/my_sys.h: Move thread variables to the right location include/mysql.h: Clean up client prototypes libmysql/libmysql.c: Clean up client prototypes mysys/my_static.h: Cleanup mysys/my_thr_init.c: Don't use DBUG library for struct st_my_thread_var to make code less complicated sql/item_cmpfunc.cc: Small optimization sql/net_pkg.cc: Cleanup sql/sql_parse.cc: Allow VARCHAR(0)
This commit is contained in:
@ -2673,7 +2673,7 @@ mysql_dump_debug_info(MYSQL *mysql)
|
||||
DBUG_RETURN(simple_command(mysql,COM_DEBUG,0,0,0));
|
||||
}
|
||||
|
||||
char * STDCALL
|
||||
const char * STDCALL
|
||||
mysql_stat(MYSQL *mysql)
|
||||
{
|
||||
DBUG_ENTER("mysql_stat");
|
||||
@ -2698,14 +2698,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);
|
||||
@ -2718,7 +2718,7 @@ 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;
|
||||
@ -2803,12 +2803,12 @@ MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res)
|
||||
return (res)->fields;
|
||||
}
|
||||
|
||||
MYSQL_ROWS * STDCALL mysql_row_tell(MYSQL_RES *res)
|
||||
MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res)
|
||||
{
|
||||
return res->data_cursor;
|
||||
}
|
||||
|
||||
uint STDCALL mysql_field_tell(MYSQL_RES *res)
|
||||
MYSQL_FIELD_OFFSET STDCALL mysql_field_tell(MYSQL_RES *res)
|
||||
{
|
||||
return (res)->current_field;
|
||||
}
|
||||
@ -2835,12 +2835,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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user