Merge mysql.com:/home/hf/work/29247/my50-29247

into mysql.com:/home/hf/work/29247/my51-29247

Merge mysql.com:/home/hf/work/29247/my50-29247
into mysql.com:/home/hf/work/29247/my51-29247
2834a07b · holyfoot/hf@hfmain.(none) · 38991f3e · 43e0e17a · 2834a07b
Commit 2834a07b authored Jun 29, 2007 by holyfoot/hf@hfmain.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql-common/client.c sql-common/client.c +1 -0

No files found.
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2451,6 +2451,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
  }
  mysql_init(&tmp_mysql);
  tmp_mysql.options= mysql->options;
+  tmp_mysql.options.my_cnf_file= tmp_mysql.options.my_cnf_group= 0;
  tmp_mysql.rpl_pivot= mysql->rpl_pivot;
  
  if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,