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

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


sql-common/client.c:
  Auto merged

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,