diff options
| author | unknown <aelkin@mysql.com> | 2006-05-16 19:33:24 +0300 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-05-16 19:33:24 +0300 |
| commit | a514a26cd0da0faa4c73be1698d897d065bca008 (patch) | |
| tree | f7111a0fec39f4fff9511a50ca0b2d09aa193792 /mysql-test/t/rpl_temporary.test | |
| parent | ab9eadf21551e0465ac1523b82741e2fc51621ba (diff) | |
| parent | 32d954f3e624890aeac23a195ff289e0c55b392c (diff) | |
| download | mariadb-git-a514a26cd0da0faa4c73be1698d897d065bca008.tar.gz | |
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
mysql-test/t/rpl_temporary.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_temporary.test')
| -rw-r--r-- | mysql-test/t/rpl_temporary.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test index 51a195e3d0e..81f0e8a0af7 100644 --- a/mysql-test/t/rpl_temporary.test +++ b/mysql-test/t/rpl_temporary.test @@ -192,7 +192,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; |