Commit f837c0ad authored by unknown's avatar unknown

Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty

sql/ha_federated.cc:
  Added auto-reconnect to allow foreign server restarts.
parent 8fc03d97
...@@ -462,6 +462,12 @@ static int check_foreign_data_source(FEDERATED_SHARE *share) ...@@ -462,6 +462,12 @@ static int check_foreign_data_source(FEDERATED_SHARE *share)
} }
else else
{ {
/*
Since we do not support transactions at this version, we can let the client
API silently reconnect. For future versions, we will need more logic to deal
with transactions
*/
mysql->reconnect= 1;
/* /*
Note: I am not using INORMATION_SCHEMA because this needs to work with < 5.0 Note: I am not using INORMATION_SCHEMA because this needs to work with < 5.0
if we can connect, then make sure the table exists if we can connect, then make sure the table exists
...@@ -988,6 +994,12 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked) ...@@ -988,6 +994,12 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked)
my_error(ER_CONNECT_TO_MASTER, MYF(0), mysql_error(mysql)); my_error(ER_CONNECT_TO_MASTER, MYF(0), mysql_error(mysql));
DBUG_RETURN(ER_CONNECT_TO_MASTER); DBUG_RETURN(ER_CONNECT_TO_MASTER);
} }
/*
Since we do not support transactions at this version, we can let the client
API silently reconnect. For future versions, we will need more logic to deal
with transactions
*/
mysql->reconnect= 1;
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment