summaryrefslogtreecommitdiff
path: root/mysql-test/suite/federated
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2009-10-23 13:02:17 +0500
committerAlexander Barkov <bar@mysql.com>2009-10-23 13:02:17 +0500
commit6be53b81ec234b29567084b2288a63aa3156dbe9 (patch)
tree0b472b055b871d2cb47a0763b8101ae0b646b585 /mysql-test/suite/federated
parent20eac04d7c43624cfd46a6a1b71d05342dc00481 (diff)
downloadmariadb-git-6be53b81ec234b29567084b2288a63aa3156dbe9.tar.gz
A postfix for WL#1349.
Fixed problems: - "mtr --mem mysql_locale_posix" could fail because of wrong temporary directory name: var/tmp/ -> $MYSQLTEST_VARDIR/tmp/ - "mtr federated_debug" could fail because of not compiled-in locale character set. Always run mysqladmin with latin1.
Diffstat (limited to 'mysql-test/suite/federated')
-rw-r--r--mysql-test/suite/federated/federated_debug.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/federated/federated_debug.test b/mysql-test/suite/federated/federated_debug.test
index 4152d2975b3..2183def4610 100644
--- a/mysql-test/suite/federated/federated_debug.test
+++ b/mysql-test/suite/federated/federated_debug.test
@@ -19,7 +19,7 @@ eval CREATE TABLE t1(a INT) ENGINE=FEDERATED
SELECT * FROM t1;
--echo # Start a asynchronous reload
---exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= refresh 2>&1
+--exec $MYSQLADMIN --no-defaults --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= refresh 2>&1
--echo # Wait for tables to be closed
let $show_statement= SHOW STATUS LIKE 'Open_tables';