database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge

Browse Source 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/t/rpl_temporary.test:
  Manual merge
sql/sql_base.cc:
  Manual merge
This commit is contained in:
unknown
2006-05-18 18:38:50 +02:00
parent a5d9932b8f 808f77f6b0
commit 89257c9171
8 changed files with 202 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/t/mysqlbinlog.test
View File

@ -124,9 +124,22 @@ select HEX(f) from t3;
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.
#
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 `<60><><EFBFBD><EFBFBD>` (a int); insert into `<60><><EFBFBD><EFBFBD>` values (1); insert into t5 select * from `<60><><EFBFBD><EFBFBD>`'
# 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) */;
# clean up
drop table t1, t2, t03, t04, t3, t4;
# End of 4.1 tests
# End of 5.0 tests