mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge dl145h.mysql.com:/tmp/andrei/MERGE/5.0_my

Browse source 
into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1


mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
This commit is contained in:
unknown 2006-06-01 22:32:33 +02:00
commit e195d46fc6
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/mysqlbinlog.result
View file

@ -190,4 +190,8 @@ select HEX(f) from t4;
HEX(f)
835C
flush logs;
drop table t1, t2, t03, t04, t3, t4;
select * from t5 /* must be (1),(1) */;
a
1
1
drop table t1, t2, t03, t04, t3, t4, t5;

19
mysql-test/t/mysqlbinlog.test
View file

@ -125,21 +125,18 @@ select HEX(f) from t04;
select HEX(f) from t4;
#
# BUG#14157: utf8 encoding in binlog without set character_set_client
#
# BUG:
# This test only works on the MySQL-internal rpl machines.
# Needs to be fixed. Problem is that koi8r is not installed
# on many machines.
#BUG#14157: utf8 encoding in binlog without set character_set_client
#
flush logs;
# --exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table if not exists t5 (a int); set names koi8r; create temporary table `ÑÝÉË` (a int); insert into `ÑÝÉË` values (1); insert into t5 select * from `ÑÝÉË`'
--exec $MYSQL test -e 'create table if not exists t5 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t5 select * from `äöüÄÖÜ`'
# resulted log is client charset insensitive (latin1 not koi8r) as it must be
# --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000006 | $MYSQL --default-character-set=latin1
#select * from t5 /* must be (1),(1) */;
# resulted binlog, parly consisting of multi-byte utf8 chars,
# must be digestable for both client and server. In 4.1 the client
# should use default-character-set same as the server.
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
select * from t5 /* must be (1),(1) */;
# clean up
drop table t1, t2, t03, t04, t3, t4;
drop table t1, t2, t03, t04, t3, t4, t5;
# End of 5.0 tests