bzr push into mysql-trunk branch (Georgi.Kodinov:3755 to 3756)

[Georgi Kodinov]

 3756 Georgi Kodinov	2012-01-20 [merge]
      merge

    modified:
      mysql-test/include/have_example_plugin.inc
      mysql-test/include/have_semisync_plugin.inc
      mysql-test/include/have_simple_parser.inc
      mysql-test/include/have_udf.inc
      mysql-test/t/udf_skip_grants-master.opt
 3755 Dmitry Shulga	2012-01-20 [merge]
      Auto-merge of patch for bug#13070308 from mysql-5.5 tree.

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
=== modified file 'mysql-test/include/have_example_plugin.inc'
--- a/mysql-test/include/have_example_plugin.inc	2010-11-17 10:16:13 +0000
+++ b/mysql-test/include/have_example_plugin.inc	2012-01-20 11:35:48 +0000
@@ -15,7 +15,7 @@ if (!$EXAMPLE_PLUGIN) {
 #
 # Check if --plugin-dir was setup for exampledb
 #
-if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$EXAMPLE_PLUGIN_OPT'`) {
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$EXAMPLE_PLUGIN_OPT/'`) {
   --skip Example plugin requires that --plugin-dir is set to the example plugin dir (either the .opt file does not contain \$EXAMPLE_PLUGIN_OPT or another plugin is in use)
 }
 enable_query_log;

=== modified file 'mysql-test/include/have_semisync_plugin.inc'
--- a/mysql-test/include/have_semisync_plugin.inc	2010-11-17 10:16:13 +0000
+++ b/mysql-test/include/have_semisync_plugin.inc	2012-01-20 11:35:48 +0000
@@ -16,6 +16,6 @@ if (!$SEMISYNC_MASTER_PLUGIN)
 #
 # Check if --plugin-dir was setup for semisync
 #
-if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SEMISYNC_PLUGIN_OPT'`) {
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$SEMISYNC_PLUGIN_OPT/'`) {
   --skip SEMISYNC plugin requires that --plugin-dir is set to the semisync plugin dir (either the .opt file does not contain \$SEMISYNC_PLUGIN_OPT or another plugin is in use)
 }

=== modified file 'mysql-test/include/have_simple_parser.inc'
--- a/mysql-test/include/have_simple_parser.inc	2010-11-17 10:16:13 +0000
+++ b/mysql-test/include/have_simple_parser.inc	2012-01-20 11:35:48 +0000
@@ -15,6 +15,6 @@ if (!$SIMPLE_PARSER) {
 #
 # Check if --plugin-dir was setup for simple parser
 #
-if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SIMPLE_PARSER_OPT'`) {
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$SIMPLE_PARSER_OPT/'`) {
   --skip simple parser requires that --plugin-dir is set to the udf plugin dir (either the .opt file does not contain \$UDF_EXAMPLE_LIB_OPT or another plugin is in use)
 }

=== modified file 'mysql-test/include/have_udf.inc'
--- a/mysql-test/include/have_udf.inc	2010-11-17 10:16:13 +0000
+++ b/mysql-test/include/have_udf.inc	2012-01-20 11:35:48 +0000
@@ -15,6 +15,6 @@ if (!$UDF_EXAMPLE_LIB) {
 #
 # Check if --plugin-dir was setup for udf
 #
-if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$UDF_EXAMPLE_LIB_OPT'`) {
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$UDF_EXAMPLE_LIB_OPT/'`) {
   --skip UDF requires that --plugin-dir is set to the udf plugin dir (either the .opt file does not contain \$UDF_EXAMPLE_LIB_OPT or another plugin is in use)
 }

=== modified file 'mysql-test/t/udf_skip_grants-master.opt'
--- a/mysql-test/t/udf_skip_grants-master.opt	2007-12-24 14:42:13 +0000
+++ b/mysql-test/t/udf_skip_grants-master.opt	2012-01-20 11:35:48 +0000
@@ -1 +1,2 @@
 --skip-grant-tables
+$UDF_EXAMPLE_LIB_OPT

No bundle (reason: useless for push emails).