From 8b6e7f66aecc198a6d4156060a2c3359c4b853cd Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mnogosearch.org>
Date: Mon, 27 May 2013 17:42:59 +0400
Subject: [PATCH] - Fixing embedded verision of the Connect engine when
 handling   table_type=MySQL (and some other types) to connect only to  
 remote MySQL server, do not try to establish embedded connections   from the
 running embedded connection.

- Disabling "mtr --embedded" for the tests that need a remote MySQL server.


modified:
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/t/occur.test
  storage/connect/mysql-test/connect/t/pivot.test
  storage/connect/mysql-test/connect/t/tbl.test
---
 storage/connect/myconn.cpp                      | 1 +
 storage/connect/mysql-test/connect/t/occur.test | 2 ++
 storage/connect/mysql-test/connect/t/pivot.test | 2 ++
 storage/connect/mysql-test/connect/t/tbl.test   | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index 5320171beeb..220be7ca0be 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -316,6 +316,7 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db,
   // 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");
+  mysql_options(m_DB, MYSQL_OPT_USE_REMOTE_CONNECTION, NULL);
 
 #if 0
   if (pwd && !strcmp(pwd, "*")) {
diff --git a/storage/connect/mysql-test/connect/t/occur.test b/storage/connect/mysql-test/connect/t/occur.test
index 5b237742fd8..36a4caafda1 100644
--- a/storage/connect/mysql-test/connect/t/occur.test
+++ b/storage/connect/mysql-test/connect/t/occur.test
@@ -1,3 +1,5 @@
+-- source include/not_embedded.inc
+
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $PORT= `select @@port`;
 --copy_file $MTR_SUITE_DIR/std_data/employee.dat $MYSQLD_DATADIR/test/employee.dat
diff --git a/storage/connect/mysql-test/connect/t/pivot.test b/storage/connect/mysql-test/connect/t/pivot.test
index e66d927bad5..7679434bca8 100644
--- a/storage/connect/mysql-test/connect/t/pivot.test
+++ b/storage/connect/mysql-test/connect/t/pivot.test
@@ -1,3 +1,5 @@
+-- source include/not_embedded.inc
+
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $PORT= `select @@port`;
 --copy_file $MTR_SUITE_DIR/std_data/expenses.txt $MYSQLD_DATADIR/test/expenses.txt
diff --git a/storage/connect/mysql-test/connect/t/tbl.test b/storage/connect/mysql-test/connect/t/tbl.test
index 143c7643afd..bdd928366ef 100644
--- a/storage/connect/mysql-test/connect/t/tbl.test
+++ b/storage/connect/mysql-test/connect/t/tbl.test
@@ -1,3 +1,5 @@
+-- source include/not_embedded.inc
+
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $PORT= `select @@port`;