database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Fixed function declaration for mysql_error and mysql_info (const char * instead of char *)

Browse Source
This commit is contained in:
Georg Richter
2016-10-06 09:44:57 +02:00
parent 85185da88f
commit 6723c52c46
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h
View File

@@ -486,8 +486,8 @@ my_bool STDCALL mysql_commit(MYSQL *mysql);
my_bool STDCALL mysql_rollback(MYSQL *mysql); my_bool STDCALL mysql_rollback(MYSQL *mysql);
my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql); my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql);
unsigned int STDCALL mysql_errno(MYSQL *mysql); unsigned int STDCALL mysql_errno(MYSQL *mysql);
char * STDCALL mysql_error(MYSQL *mysql); const char * STDCALL mysql_error(MYSQL *mysql);
char * STDCALL mysql_info(MYSQL *mysql); const char * STDCALL mysql_info(MYSQL *mysql);
unsigned long STDCALL mysql_thread_id(MYSQL *mysql); unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
const char * STDCALL mysql_character_set_name(MYSQL *mysql); const char * STDCALL mysql_character_set_name(MYSQL *mysql);
void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *cs); void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *cs);

4
libmariadb/mariadb_lib.c
View File

@@ -3291,12 +3291,12 @@ uint STDCALL mysql_errno(MYSQL *mysql)
return mysql ? mysql->net.last_errno : 0; return mysql ? mysql->net.last_errno : 0;
} }
char * STDCALL mysql_error(MYSQL *mysql) const char * STDCALL mysql_error(MYSQL *mysql)
{ {
return mysql ? (mysql)->net.last_error : (char *)""; return mysql ? (mysql)->net.last_error : (char *)"";
} }
char *STDCALL mysql_info(MYSQL *mysql) const char *STDCALL mysql_info(MYSQL *mysql)
{ {
return (mysql)->info; return (mysql)->info;
} }