summaryrefslogtreecommitdiff
path: root/storage/connect/myconn.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-07-06 10:58:22 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-07-06 10:58:22 +0200
commit63446440437fea4e8f6800b4676105d6617e49a1 (patch)
tree215f21a78ebd42d979171f95ab273f637046d37c /storage/connect/myconn.cpp
parentce1b9cb4ba8917af1f2d16b20ab69a46af8fc5e4 (diff)
downloadmariadb-git-63446440437fea4e8f6800b4676105d6617e49a1.tar.gz
- Remove unuseful option causing valgrind error or warning
modified: storage/connect/myconn.cpp
Diffstat (limited to 'storage/connect/myconn.cpp')
-rw-r--r--storage/connect/myconn.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index d49b3cfcf04..4cad68a9a1e 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -320,10 +320,8 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db,
return RC_FX;
} // endif m_DB
- // Notice that the client and server use separate group names.
- // This is critical, because the server will not accept the
- // client's options, and vice versa.
- mysql_options(m_DB, MYSQL_READ_DEFAULT_GROUP, "PlugDB_CLIENT");
+ // Removed to do like FEDERATED do
+//mysql_options(m_DB, MYSQL_READ_DEFAULT_GROUP, "client-mariadb");
mysql_options(m_DB, MYSQL_OPT_USE_REMOTE_CONNECTION, NULL);
mysql_options(m_DB, MYSQL_OPT_CONNECT_TIMEOUT, &cto);
mysql_options(m_DB, MYSQL_OPT_READ_TIMEOUT, &nrt);