1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A postfix for WL#1349.

Browse Source 
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.
This commit is contained in:
Alexander Barkov 2009-10-23 13:02:17 +05:00
parent 08ecfb9a8b
commit e17d05cdc7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/federated/federated_debug.test
View File

@ -19,7 +19,7 @@ eval CREATE TABLE t1(a INT) ENGINE=FEDERATED
SELECT * FROM t1; SELECT * FROM t1;
--echo # Start a asynchronous reload --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 --echo # Wait for tables to be closed
let $show_statement= SHOW STATUS LIKE 'Open_tables'; let $show_statement= SHOW STATUS LIKE 'Open_tables';

4
mysql-test/t/mysql_locale_posix.test
View File

@ -18,11 +18,11 @@
# #
--disable_query_log --disable_query_log
--exec locale -a > var/tmp/locale_a.output 2>/dev/null || true --exec locale -a > $MYSQLTEST_VARDIR/tmp/locale_a.output 2>/dev/null || true
SET @file=REPLACE(LOAD_FILE('../../tmp/locale_a.output'), '-', ''); SET @file=REPLACE(LOAD_FILE('../../tmp/locale_a.output'), '-', '');
# make it case insensitive # make it case insensitive
SET @file=CAST(@file AS CHAR CHARACTER SET latin1) COLLATE latin1_swedish_ci; SET @file=CAST(@file AS CHAR CHARACTER SET latin1) COLLATE latin1_swedish_ci;
--remove_file var/tmp/locale_a.output --remove_file $MYSQLTEST_VARDIR/tmp/locale_a.output
if (`SELECT (IFNULL(@file,'') NOT LIKE '%\nde_DE.iso88591\n%')`) if (`SELECT (IFNULL(@file,'') NOT LIKE '%\nde_DE.iso88591\n%')`)
{ {