bzr push into mysql-6.0-bugteam branch (kgeorge:2764 to 2766) Bug#22891

[Georgi Kodinov]

 2766 Georgi Kodinov	2008-12-01
      Addendum to bug #22891.
      Moved the setting of max_allowed_packet to a .opt file.
added:
  mysql-test/suite/falcon/t/falcon_bug_22184-master.opt
modified:
  mysql-test/suite/falcon/r/falcon_bug_22184.result
  mysql-test/suite/falcon/t/falcon_bug_22184.test

 2765 Georgi Kodinov	2008-12-01 [merge]
      merged the addendum to bug 37339 to 5.1-bugteam
modified:
  mysql-test/r/ctype_filesystem.result
  mysql-test/t/ctype_filesystem-master.opt
  mysql-test/t/ctype_filesystem.test

 2764 Gleb Shchepa	2008-12-01 [merge]
      auto merge 5.1-bugteam --> 6.0-bugteam

=== modified file 'mysql-test/r/ctype_filesystem.result'
--- a/mysql-test/r/ctype_filesystem.result	2008-11-28 14:25:16 +0000
+++ b/mysql-test/r/ctype_filesystem.result	2008-12-01 11:34:53 +0000
@@ -1,7 +1,7 @@
 SET CHARACTER SET utf8;
 SHOW VARIABLES like 'character_sets_dir';
 Variable_name	Value
-character_sets_dir	/ß/
+character_sets_dir	MYSQL_TEST_DIR/able_name	Value
 character_set_filesystem	latin1

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22184.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22184.result	2007-09-20 15:44:25 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22184.result	2008-12-01 14:29:45 +0000
@@ -1,7 +1,6 @@
 SET STORAGE_ENGINE = Falcon;
 *** Bug #22184 ***
 DROP TABLE IF EXISTS t6;
-SET @@max_allowed_packet = 20000000;
 CREATE TABLE t6 (s1 longblob);
 INSERT INTO t6 VALUES (repeat('a',2100000));
 INSERT INTO t6 VALUES (repeat('a',2200000));

=== added file 'mysql-test/suite/falcon/t/falcon_bug_22184-master.opt'
--- a/mysql-test/suite/falcon/t/falcon_bug_22184-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22184-master.opt	2008-12-01 14:29:45 +0000
@@ -0,0 +1 @@
+--max_allowed_packet=20000000

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22184.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22184.test	2007-09-29 04:30:42 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22184.test	2008-12-01 14:29:45 +0000
@@ -8,7 +8,6 @@ SET STORAGE_ENGINE = Falcon;
 DROP TABLE IF EXISTS t6;
 --enable_warnings
 
-SET @@max_allowed_packet = 20000000;
 CREATE TABLE t6 (s1 longblob);
 INSERT INTO t6 VALUES (repeat('a',2100000));
 INSERT INTO t6 VALUES (repeat('a',2200000));

=== modified file 'mysql-test/t/ctype_filesystem-master.opt'
--- a/mysql-test/t/ctype_filesystem-master.opt	2008-11-28 14:25:16 +0000
+++ b/mysql-test/t/ctype_filesystem-master.opt	2008-12-01 11:34:53 +0000
@@ -1,2 +1,2 @@
---character-sets-dir=/�+--character-sets-dir=$MYSQL_TEST_DIR/� --character-set-filesystem=latin1

=== modified file 'mysql-test/t/ctype_filesystem.test'
--- a/mysql-test/t/ctype_filesystem.test	2008-11-28 14:25:16 +0000
+++ b/mysql-test/t/ctype_filesystem.test	2008-12-01 11:34:53 +0000
@@ -1,4 +1,5 @@
 SET CHARACTER SET utf8;
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 SHOW VARIABLES like 'character_sets_dir';
 SHOW VARIABLES like 'character_set_filesystem';
 SHOW VARIABLES like 'character_set_client';