diff options
author | unknown <monty@mysql.com> | 2006-03-27 12:02:23 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-03-27 12:02:23 +0300 |
commit | 783780f1c92e6c8b3ebbb1f40ca34cc14336f81b (patch) | |
tree | cc00986022c0695ffae27ba71fbdea834df8e77b /sql-common/client.c | |
parent | 6d7711660c5918476ce886969585fbc2211a9b8f (diff) | |
download | mariadb-git-783780f1c92e6c8b3ebbb1f40ca34cc14336f81b.tar.gz |
Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
include/mysql.h:
Safer fix for Bug #18435
sql-common/client.c:
Safer fix for Bug #18435
Diffstat (limited to 'sql-common/client.c')
-rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 4c7ef3fcd03..cd50960164b 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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; |