summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql_plugin.result
diff options
context:
space:
mode:
authorChuck Bell <chuck.bell@oracle.com>2011-08-09 08:58:18 -0400
committerChuck Bell <chuck.bell@oracle.com>2011-08-09 08:58:18 -0400
commit99f2e85b6cefa8e864a5099324301d110aa3048b (patch)
treeef935702caaf0b9741ef36d472fa61c866c173a8 /mysql-test/r/mysql_plugin.result
parent6c4da66d8307bf139051864fb9def7159e72e2b8 (diff)
downloadmariadb-git-99f2e85b6cefa8e864a5099324301d110aa3048b.tar.gz
WL#5710 : enable and disable plugins
This patch corrects a problem found in PB. Some platforms have very different locations for the mysql installation. The client was not able to find either my_print_defaults or mysqld predictably. The patch adds two new command options --mysqld and --my-print-defaults which can be used to provide the location of mysqld and my_print_defaults by providing the paths. The patch also changes the concatenation of the soname extension to fix a problem found on some Ubuntu systems. The patch contains changes to the test to ensure it will run on all platforms. A trap is set in the test to skip testing if the location of mysqld, my_print_defaults, or the daemon_example.ini files cannot be determined.
Diffstat (limited to 'mysql-test/r/mysql_plugin.result')
-rw-r--r--mysql-test/r/mysql_plugin.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_plugin.result b/mysql-test/r/mysql_plugin.result
index 1a39c86ab9a..949f3748236 100644
--- a/mysql-test/r/mysql_plugin.result
+++ b/mysql-test/r/mysql_plugin.result
@@ -49,6 +49,14 @@ ERROR: Cannot access basedir at '/basedir_not_there/'.
#
ERROR: Cannot read plugin config file daemon_example. File does not exist.
#
+# Attempt to use bad paths - mysqld
+#
+ERROR: Cannot access mysqld path '/mysqld_not_there/'.
+#
+# Attempt to use bad paths - my_print_defaults
+#
+ERROR: Cannot access my-print-defaults path '/my_print_defaults_not_there/'.
+#
# Missing library
#
ERROR: The plugin library is missing or in a different location.
@@ -90,6 +98,10 @@ Options:
-n, --no-defaults Do not read values from configuration file.
-P, --print-defaults
Show default values from configuration file.
+ -m, --mysqld=name Path to mysqld executable. Example: /sbin/temp1/mysql/bin
+ -f, --my-print-defaults=name
+ Path to my_print_defaults executable. Example:
+ /source/temp11/extra
-v, --verbose More verbose output; you can use this multiple times to
get even more verbose output.
-V, --version Output version information and exit.