summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-03-27 12:02:23 +0300
committermonty@mysql.com <>2006-03-27 12:02:23 +0300
commit3dcbbb7c4d790b7349449d3f751ca49f2ff22117 (patch)
treecc00986022c0695ffae27ba71fbdea834df8e77b /sql-common
parentbc4f7bfd74388655a92e1bfaeb6b5dfd5e3df461 (diff)
downloadmariadb-git-3dcbbb7c4d790b7349449d3f751ca49f2ff22117.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
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c6
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;