From 3e6330e78343276a909fec866dc8e07f736e8900 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Mar 2006 00:37:40 +0200 Subject: [PATCH 1/2] Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and 5.0.18 by not reseting or accessing the info_buffer member --- sql-common/client.c | 13 +++++++++++-- 1 file 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; } From b31eca1e5282d4e86d29f97021744a115ac1c037 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Mar 2006 12:15:13 +0400 Subject: [PATCH 2/2] ctype-czech.c: Fixing wrong min_sort_char. strings/ctype-czech.c: Fixing wrong min_sort_char. --- strings/ctype-czech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c index 8f65825ece5..d9f95868d6d 100644 --- a/strings/ctype-czech.c +++ b/strings/ctype-czech.c @@ -356,7 +356,7 @@ static int my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)), #ifdef REAL_MYSQL -#define min_sort_char 0 +#define min_sort_char ' ' #define max_sort_char '9' #define EXAMPLE