From: Saikumar V
Date: July 29 2011 9:17am
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3480)
List-Archive: http://lists.mysql.com/commits/140499
Message-Id: <201107290918.p6T9Ikcr004656@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1510005567=="

--===============1510005567==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/saikumar/work/opt-test/mysql-5.5-itch/ based on revid:chuck.bell@stripped

 3480 Saikumar V	2011-07-29
      Changes to test mysql_plugin with the new options --mysqld and ----my_print_defaults

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-28 18:18:07 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-29 09:17:44 +0000
@@ -10,26 +10,27 @@ let $MYSQL_BASEDIR= `select @@basedir`;
 
 # The mysql_plugin tool expects all executables in "basedir", so they will be copied to it.
 # It also expects a directory structure like in the installed mysql version, so errmsg.sys
-# will be copied to "basedir/share". The directories differ between Windows and Unix.
+# will be copied to "basedir/share". 
 --disable_abort_on_error
-if(`SELECT CONVERT(@@version_compile_os USING latin1)
-    IN ('Win32','Win64','Windows')`)
-{
-   let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/sql/Debug;
-   --copy_file $MYSQL_BASEDIR/extra/Debug/my_print_defaults.exe $MYSQLD_BASEDIR/my_print_defaults.exe
-   --mkdir $MYSQLD_BASEDIR/share
-   --copy_file $MYSQL_BASEDIR/sql/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
-   --copy_file $MYSQL_BASEDIR/plugin/daemon_example/daemon_example.ini $DAEMONEXAMPLE_DIR/daemon_example.ini
-}
-if (`SELECT CONVERT(@@version_compile_os USING latin1)
-    NOT IN ('Win32','Win64','Windows')`)
-{
-   let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/sql;
-   --copy_file $MYSQL_BASEDIR/extra/my_print_defaults $MYSQLD_BASEDIR/my_print_defaults
-   --copy_file $MYSQL_BASEDIR/sql/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
-}
 
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQL_BOOTSTRAP --my-print-defaults=$MY_PRINT_DEFAULTS;
+# The mysql_plugin tool now accepts --mysqld the path to mysqld server,
+# the mysqld path is extracted from MYSQLD_BOOTSTRAP_CMD line.
+# The directories differ between Windows and Unix.
+perl;
+  my ($mysqld)= split " ", $ENV{MYSQLD_BOOTSTRAP_CMD};
+  open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/mysqld.inc") or die;
+  print FILE "let \$MYSQLD= $mysqld;\n";
+  close FILE;
+EOF
+
+source $MYSQL_TMP_DIR/mysqld.inc;
+remove_file $MYSQL_TMP_DIR/mysqld.inc;
+
+let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/bin;
+--mkdir $MYSQLD_BASEDIR/share
+--copy_file $MYSQL_BASEDIR/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
+
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 
 --echo #
 --echo # Ensure the plugin isn't loaded.
@@ -144,56 +145,56 @@ EOF
 --echo # 
 --echo # Attempt to use bad paths - datadir
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Attempt to use bad paths - basedir
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=/basedir_not_there/ --plugin-dir=$DAEMONEXAMPLE_DIR;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=/basedir_not_there/ --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Attempt to use bad paths - plugin_dir
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=/plugin_not_there/;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=/plugin_not_there/ --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Missing library
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_soname.ini;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_soname.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Bad format for config file
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_format.ini;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_format.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Missing base_dir option
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --plugin-dir=$DAEMONEXAMPLE_DIR;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,139,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Missing data_dir option
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,139,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Missing plugin_dir option
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,139,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
@@ -223,18 +224,7 @@ EOF
 --error 0,1
 --remove_file $expect_file
 
-if(`SELECT CONVERT(@@version_compile_os USING latin1)
-    IN ('Win32','Win64','Windows')`)
-{
-  --remove_file $DAEMONEXAMPLE_DIR/daemon_example.ini
-  --remove_file $MYSQLD_BASEDIR/my_print_defaults.exe
-  --remove_file $MYSQLD_BASEDIR/share/errmsg.sys
-  --rmdir $MYSQLD_BASEDIR/share
-}
-if(`SELECT CONVERT(@@version_compile_os USING latin1)
-    NOT IN ('Win32','Win64','Windows')`)
-{
-  --remove_file $MYSQLD_BASEDIR/my_print_defaults
-  --remove_file $MYSQLD_BASEDIR/share/errmsg.sys
-}
+--remove_file $MYSQLD_BASEDIR/share/errmsg.sys
+--rmdir $MYSQLD_BASEDIR/share
+
 --enable_abort_on_error


--===============1510005567==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/saikumar.v@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: saikumar.v@stripped
# target_branch: file:///home/saikumar/work/opt-test/mysql-5.5-itch/
# testament_sha1: dc953407271bf4abff9694fb4e6b73e6a3c9f117
# timestamp: 2011-07-29 14:47:46 +0530
# base_revision_id: chuck.bell@stripped\
#   3aqdcldmm20oj2lf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT1Ud44AAtjfgEAQXGf//3+n
/+S////6YAaOcn310B7vQW6lUDJ3YeEkpoZTKm8VNsmJqeqHowk00HqMEYCADRocZMmjEMTTAQMC
aYIwTE000AGEGpkNJ6U01GIME8o0NqAYgMhoA2oDQJEiZVMwm0keTU9TQZGyR6mATIDaj1M1A0BF
JEZGo9MinqfpEyYmhpoMAjBAyPR6oGgkkE0ZAjEJozSFPQajTJpoAAaDINMnRmrwfeBBnfPvJb5P
vhqcFk1l1MmfJGrXRvEEefddQllsnKJjAd2tJSYa72N7fBGswW1Eb0NAx/y/9Ob0d0IfIxaEFwmW
aiEQwKAW6czbBbFVkywBakzjIhQVwnFQXAU5LE5zNXHIkWo2RVgEzS28FIt3rKfbrlSUxNxkVU8B
ookSsW7tHK+vTMlaCNDcCtFiu8Fq2HF4NzHgy48UU83DFtpcrMk2jgBpRbCD6tKQk0mNA0DGcTKv
y08OKM70KiC4wGxJMwl4R6Q8BcplaAuAkzMb3oRdQDi8FriZ/5sv6qdoVKajFfe5GxZ2y7fmJQ5Z
jP4yMFOaicxQ4lfZG9Fnn3ZnmBVeiMDd3dlVYMC7mLLRVp6e6BWQiRC0KiIgwKhld51UMZOL3HAB
kQsHo17pdZrhGOhnYIB4+p9NkSJNgcJjTIBwzcGNC6p5k8vyv3kfEWZK12/vBSnqG2UrqEHPsu0x
B8ani2XhkN7wiVM+bW+7Gv3mlUP9JlbW1Rpe5F+YOPBwqShtFJdhFPYOzOYq8R8eTXNjm4oUKrSl
0uvCFxNU5BPiQTRnviNve09yV+V0J0GrlWxuM/JtyszG1y2rdtaW28HshVpQaUlJQhEk4CQQc9sp
xeVtZXpMhZIhbGMBWG15oWC6PlscGc7icymNGK5BfApe1W5w6D00pOgVg+DfZBTlo106uKWziM+v
3iNu9NY0J2MUmQMJbUGok288b2YPWulci3rap6BZl6kLM8MH7QdEJHD90HaIfYlMA+wmFG4aIGwY
nMSVkNO0LUhQtJjyHzWldOohtdMXoWulDyIVoBeAng3rQhCEyDepUuVbHKKasIeMKsXIVIWrCFLc
uspOpJcAhjUk3IAUABUpWhKSGAX+IASUxmvOuJKVLkKlNCExYToYUJE5FK6oiEvDOtEEMS2khpXk
FUmSUxBfQNGUziMxHY87lOA5XbNKHiPT3wMjBEHJMScnr2+4hKeMtvdSCm6R8ALzaRqDk5L15kv2
KrTLIPmoyTxYIwEPV6B47qEa/91Ww1nL2Ac9FV50naDpOPnEr6ztiGJrvHRJjjMEqghYD0i2RckS
fjHo1R8Txkzd7LHts2XcCxVJpQTIJmStA/Hd1hkdQiW3UbX26USZKpJmc6NwU0/XAjWFvm342CSD
kihy3hk7f4BjE+l5jVsnywNEU5+Q0w/U2m3GvO7MRsbne1fumaCN3lyy8je3+nFYczId6NLi9MvU
ZssdWF1azTzpors7VvQ2CRu1BbwEq0PrPHz7zRQEWpwza8zBWr/fPdg0GtZt4s15cES8wA3X5tFy
rZg/BhfOQVsXJgrMEJ+5uwgcRqbU2sY1PWIHAXhA05pLm3oXQ4B8NcomJgke3lvq6gwyQljTrBqb
e7hZH0Bx9Z2Cl05B2gWdopz9NAiEHBvcEEkUCsGSG6DaCPDxDTWrulK0MEp0teIeVgHVOBiwwhsg
c4DFFw7jeVcOIV4BXIY9M11i29hB/ayMW87JD0zTgQbV1n7iAL7Q2wbrCvsYxSlEpwFNXkVK2UYh
g2ms2JZBYfWFY8YKS3jc9XWVWtJzN8EiCLQ5OV3crtbryHJz6cWZMPJdGyGeVZm4Qy44azgIpZNs
eoKIF01FwISk6Wgks8zuEkHApigN+uhoYcNuaZK5WGGzHapNEEKFuXPfxkAgzLSroapKmcIu/l15
pGr2Q3MwiaSyit0gZUFAHeytcn8MKZoFglRHiqPEYaOyCj4cmckeojmoIHVw79l9q7nDVyZ6tTp8
sDsfUFwW3pr3VWoLGercc/UERB3i1SxEc0fKA2GzU0ScXrCl4ewWoqShw3D4CyiSGCVizcI1ME5A
tlZyhky6RV4/4u5IpwoSB6qO8cA=


--===============1510005567==--