From 40c2a8870b7dea27917430d995a0acb91465b892 Mon Sep 17 00:00:00 2001
From: unknown <guilhem@mysql.com>
Date: Thu, 9 Dec 2004 14:44:10 +0100
Subject: Changing the default of libmysqlclient : it's now NO reconnection.
 All our programs which use mysql_real_connect() and mysql_connect() are
 updated accordingly, though I have deliberately made mysqlimport not
 reconnect anymore (already true for mysqldump >= 4.1.8). All Connector devs
 have been warned about the change I'm doing here - which was agreed with
 Monty, and fixes BUG#2555.

VC++Files/libmysqltest/mytest.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
  explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
  explicit mention of reconnect (no behaviour change)
client/mysql.cc:
  explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
  explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
  explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
  and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
  does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
  explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
  explicit mention of reconnect (no behaviour change).
  Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
  but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
  explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
  explicit mention of reconnect (no behaviour change)
sql-common/client.c:
  Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
  explicit mention of reconnect (no behaviour change)
sql/slave.cc:
  explicit mention of reconnect (no behaviour change)
tests/client_test.c:
  explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
  explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
  explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
  explicit mention of reconnect (no behaviour change)
tests/list_test.c:
  explicit mention of reconnect (no behaviour change)
tests/select_test.c:
  explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
  explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
  explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
  explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
  explicit mention of reconnect (no behaviour change)
---
 libmysql/libmysql.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libmysql/libmysql.c')

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 3e98d8399ff..2355f9f6617 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -317,6 +317,7 @@ my_bool STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
   DBUG_ENTER("mysql_master_send_query");
   if (!master->net.vio && !mysql_real_connect(master,0,0,0,0,0,0,0))
     DBUG_RETURN(1);
+  master->reconnect= 1;
   mysql->last_used_con = master;
   DBUG_RETURN(simple_command(master, COM_QUERY, q, length, 1));
 }
@@ -351,6 +352,7 @@ my_bool STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
   if (!slave_to_use->net.vio && !mysql_real_connect(slave_to_use, 0,0,0,
 						    0,0,0,0))
     DBUG_RETURN(1);
+  slave_to_use->reconnect= 1;
   DBUG_RETURN(simple_command(slave_to_use, COM_QUERY, q, length, 1));
 }
 
@@ -448,6 +450,7 @@ static my_bool get_slaves_from_master(MYSQL* mysql)
     expand_error(mysql, CR_PROBE_MASTER_CONNECT);
     DBUG_RETURN(1);
   }
+  mysql->reconnect= 1;
 
   if (mysql_query(mysql, "SHOW SLAVE HOSTS") ||
       !(res = mysql_store_result(mysql)))
@@ -615,6 +618,7 @@ mysql_connect(MYSQL *mysql,const char *host,
       if (mysql->free_me)
 	my_free((gptr) mysql,MYF(0));
     }
+    mysql->reconnect= 1;
     DBUG_RETURN(res);
   }
 }
-- 
cgit v1.2.1