bk commit into 5.1 tree (jmiller:1.2378) BUG#15126

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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@stripped, 2006-12-13 21:45:18+01:00, jmiller@stripped +2 -0
  rpl_collation_db.test, rpl_collation_db.result:
    Test Case for Bug#15126. I was not able to reproduce the issue listed in the bug report, but I am wondering about the show database for Test #1. It shows to be 40100 DEFAULT CHARACTER SET latin1 eventhough both collation_database & character_set_database is set to utf8

  mysql-test/r/rpl_collation_db.result@stripped, 2006-12-13 21:45:05+01:00, jmiller@stripped +1 -0
    Test Case for Bug#15126. I was not able to reproduce the issue listed in the bug report, but I am wondering about the show database for Test #1. It shows to be 40100 DEFAULT CHARACTER SET latin1 eventhough both collation_database & character_set_database is set to utf8

  mysql-test/t/rpl_collation_db.test@stripped, 2006-12-13 21:45:01+01:00, jmiller@stripped +1 -0
    Test Case for Bug#15126. I was not able to reproduce the issue listed in the bug report, but I am wondering about the show database for Test #1. It shows to be 40100 DEFAULT CHARACTER SET latin1 eventhough both collation_database & character_set_database is set to utf8

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/data2/mysql-5.1-new-rpl

--- 1.1/mysql-test/r/rpl_collation_db.result	2006-12-13 21:45:28 +01:00
+++ 1.2/mysql-test/r/rpl_collation_db.result	2006-12-13 21:45:28 +01:00
@@ -365,6 +365,7 @@
 a	b
 _testing	ё_load
+
 ** Sync Slave Test 5 **
 SHOW VARIABLES LIKE "collation_database";
 Variable_name	Value

--- 1.1/mysql-test/t/rpl_collation_db.test	2006-12-13 21:45:28 +01:00
+++ 1.2/mysql-test/t/rpl_collation_db.test	2006-12-13 21:45:28 +01:00
@@ -299,6 +299,7 @@
 SELECT * FROM foo.t2;
 --echo
 SELECT * FROM foo.t3;
+--echo
 
 --echo ** Sync Slave Test 5 **
 --snyc_slave_with_master