summaryrefslogtreecommitdiffstats
path: root/mysql-plugin-test.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-12 08:48:17 +0200
committerRemi Collet <fedora@famillecollet.com>2013-10-12 08:48:17 +0200
commita337a6cbb4c6e3701f16040ecbae43fc71110b97 (patch)
tree2a9c13f5ea10086d32ebd871329ec04eb2d5c7e3 /mysql-plugin-test.patch
parent6824e2d5b2cb30ce3c83da8d33296f02e193ea2a (diff)
compat-mysql55: try to update to 5.5.34, but don't build, need investigation
Diffstat (limited to 'mysql-plugin-test.patch')
-rw-r--r--mysql-plugin-test.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-plugin-test.patch b/mysql-plugin-test.patch
index 5d08c32..10cc791 100644
--- a/mysql-plugin-test.patch
+++ b/mysql-plugin-test.patch
@@ -12,9 +12,9 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt.plugin mysql-5.5.21/m
@@ -1 +1 @@
---plugin-dir=$DAEMONEXAMPLE_DIR
+--plugin-dir=$MYSQLTEST_VARDIR/plugin
-diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-test/t/mysql_plugin.test
---- mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin 2012-01-31 12:28:15.000000000 +0100
-+++ mysql-5.5.21/mysql-test/t/mysql_plugin.test 2012-03-14 17:11:40.769295981 +0100
+diff -up mysql-5.5.31/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.31/mysql-test/t/mysql_plugin.test
+--- mysql-5.5.31/mysql-test/t/mysql_plugin.test.test 2013-03-25 14:14:58.000000000 +0100
++++ mysql-5.5.31/mysql-test/t/mysql_plugin.test 2013-04-18 14:43:15.747052348 +0200
@@ -25,8 +25,10 @@
# Add the datadir, basedir, plugin_dir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`;
@@ -70,7 +70,7 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
--echo #
--echo # Ensure the plugin isn't loaded.
-@@ -202,7 +209,7 @@ EOF
+@@ -184,7 +191,7 @@ SELECT * FROM mysql.plugin WHERE dl like
# we must copy the example daemon to a new location renaming it.
let $DAEMON_RELOAD = lib$DAEMONEXAMPLE;
@@ -79,8 +79,8 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
--copy_file include/libdaemon_example.ini $PLUGIN_DIR/libdaemon_example.ini
# Now reload it and see that it is a different name.
-@@ -395,8 +402,11 @@ EOF
- --remove_file $expect_file
+@@ -361,8 +368,11 @@ replace_result $MYSQL_PLUGIN mysql_plugi
+ --remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
# Cleanup the share folder in the binary path.
---remove_file $MYSQLD_BASEDIR/share/errmsg.sys