Commit 2dfd0fa6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.1-new


sql-common/client.c:
  Auto merged
parents cea5dcf6 b31eca1e

sql-common/client.c

+11 −2
Original line number Diff line number Diff line
@@ -1428,7 +1428,13 @@ 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;
@@ -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;

}

strings/ctype-czech.c

+1 −1
Original line number Diff line number Diff line
@@ -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