mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
SCRUM:
embedded library I decided to get rid of #define mysql_some_function in mysql.h It puzzles users and makes problems with dynamic libraries Finally, there are only two functions left, that are covered with the #define-s and it won't hurt performance at all client/mysqltest.c: that'll be faster include/mysql.h: #defines changed to functions libmysql/libmysql.c: that'll be faster that calls of wrapper functions libmysqld/libmysqld.c: skip wrapper function sql-common/client.c: skip wrapper function
This commit is contained in:
@@ -1998,7 +1998,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
|
||||
goto error;
|
||||
if (mysql->fields)
|
||||
{
|
||||
if (!(res= mysql_use_result(mysql)))
|
||||
if (!(res= cli_mysql_use_result(mysql)))
|
||||
goto error;
|
||||
mysql_free_result(res);
|
||||
}
|
||||
@@ -2217,7 +2217,7 @@ static my_bool STDCALL cli_mysql_read_query_result(MYSQL *mysql)
|
||||
ulong field_count;
|
||||
MYSQL_DATA *fields;
|
||||
ulong length;
|
||||
DBUG_ENTER("mysql_read_query_result");
|
||||
DBUG_ENTER("cli_mysql_read_query_result");
|
||||
|
||||
/*
|
||||
Read from the connection which we actually used, which
|
||||
@@ -2320,7 +2320,7 @@ mysql_real_query(MYSQL *mysql, const char *query, ulong length)
|
||||
|
||||
if (mysql_send_query(mysql,query,length))
|
||||
DBUG_RETURN(1);
|
||||
DBUG_RETURN((int) mysql_read_query_result(mysql));
|
||||
DBUG_RETURN((int) (*mysql->methods->read_query_result)(mysql));
|
||||
}
|
||||
|
||||
|
||||
@@ -2389,7 +2389,7 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
|
||||
static MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql)
|
||||
{
|
||||
MYSQL_RES *result;
|
||||
DBUG_ENTER("mysql_use_result");
|
||||
DBUG_ENTER("cli_mysql_use_result");
|
||||
|
||||
mysql = mysql->last_used_con;
|
||||
|
||||
|
Reference in New Issue
Block a user