- 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
This commit is contained in:
Alexander Barkov 2013-05-27 17:42:59 +04:00
parent 941a20a48a
commit 8b6e7f66ae
4 changed files with 7 additions and 0 deletions

View file

@ -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, "*")) {

View file

@ -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

View file

@ -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

View file

@ -1,3 +1,5 @@
-- source include/not_embedded.inc
let $MYSQLD_DATADIR= `select @@datadir`;
let $PORT= `select @@port`;