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

Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"

Browse source 
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
This commit is contained in:
monty@mysql.com 2006-03-27 12:02:23 +03:00
commit 3dcbbb7c4d
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/mysql.h
View file

@ -287,8 +287,10 @@ typedef struct st_mysql
from mysql_stmt_close if close had to cancel result set of this object.
*/
my_bool *unbuffered_fetch_owner;
#if defined(EMBEDDED_LIBRARY) || defined(EMBEDDED_LIBRARY_COMPATIBLE) || MYSQL_VERSION_ID >= 50100
/* needed for embedded server - no net buffer to store the 'info' */
char *info_buffer;
#endif
} MYSQL;
typedef struct st_mysql_res {

6
sql-common/client.c
View file

@ -1428,13 +1428,7 @@ mysql_init(MYSQL *mysql)
mysql->free_me=1;
}
else
{
#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
bzero((char*) (mysql), sizeof(*(mysql)));
#else
bzero((char*) (mysql), offsetof(MYSQL, info_buffer));
#endif
}
mysql->options.connect_timeout= CONNECT_TIMEOUT;
mysql->last_used_con= mysql->next_slave= mysql->master = mysql;
mysql->charset=default_charset_info;