summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tulin@production.mysql.com>2006-05-16 21:46:52 +0200
committerunknown <tulin@production.mysql.com>2006-05-16 21:46:52 +0200
commitafb3f432b00e18c40613335207386645020318ce (patch)
treedf607cfa9adeee272f747258343965c791722574 /mysql-test
parentc62cf51859527ab0744bfc9bffd75b5c8110ea07 (diff)
parent32d954f3e624890aeac23a195ff289e0c55b392c (diff)
downloadmariadb-git-afb3f432b00e18c40613335207386645020318ce.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/usersnfs/tulin/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/rpl_temporary.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index 871ff096476..bc1b0e64565 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -164,7 +164,7 @@ drop table t1;
#
#14157: utf8 encoding in binlog without set character_set_client
#
---exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `ÑÝÉË` (a int); insert into `ÑÝÉË` values (1); insert into t1 select * from `ÑÝÉË`'
+--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'
sync_slave_with_master;
#connection slave;