bk commit into 5.0 tree (aelkin:1.2139)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2139 06/05/14 20:50:15 aelkin@stripped +2 -0
  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/mysqlbinlog.test
    1.26 06/05/14 20:50:11 aelkin@stripped +2 -3
    manual merge

  mysql-test/t/rpl_temporary.test
    1.21 06/05/14 20:32:23 aelkin@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0/RESYNC

--- 1.25/mysql-test/t/mysqlbinlog.test	2006-05-14 11:35:29 +03:00
+++ 1.26/mysql-test/t/mysqlbinlog.test	2006-05-14 20:50:11 +03:00
@@ -126,7 +126,7 @@
 #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 --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 `ÑÝÉË`'
 
 # 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
@@ -135,4 +135,4 @@
 # clean up
 drop table t1, t2, t03, t04, t3, t4, t5; 
 
-# End of 4.1 tests
+# End of 5.0 tests

--- 1.20/mysql-test/t/rpl_temporary.test	2006-05-14 11:35:29 +03:00
+++ 1.21/mysql-test/t/rpl_temporary.test	2006-05-14 20:32:23 +03:00
@@ -192,7 +192,7 @@
 #
 #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=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 `ÑÝÉË`'
 
 sync_slave_with_master;
 #connection slave;