diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-23 08:23:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-23 08:23:33 +0100 |
| commit | 6d7711660c5918476ce886969585fbc2211a9b8f (patch) | |
| tree | 914a2dbcf17831fdd44a852b5bc925a881d9e33c /sql-common | |
| parent | c3e7925f721255f38b18fde2eaa1dc58fe4acb5e (diff) | |
| parent | 3e6330e78343276a909fec866dc8e07f736e8900 (diff) | |
| download | mariadb-git-6d7711660c5918476ce886969585fbc2211a9b8f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 2d826df0662..4c7ef3fcd03 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1428,7 +1428,13 @@ mysql_init(MYSQL *mysql) mysql->free_me=1; } else - bzero((char*) (mysql),sizeof(*(mysql))); + { +#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; @@ -2341,9 +2347,12 @@ static void mysql_close_free(MYSQL *mysql) my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->passwd,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR)); +#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100 my_free(mysql->info_buffer,MYF(MY_ALLOW_ZERO_PTR)); + mysql->info_buffer= 0; +#endif /* Clear pointers for better safety */ - mysql->info_buffer=mysql->host_info=mysql->user=mysql->passwd=mysql->db=0; + mysql->host_info= mysql->user= mysql->passwd= mysql->db= 0; } |