From: Saikumar V
Date: July 29 2011 9:09am
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3481)
List-Archive: http://lists.mysql.com/commits/140506
Message-Id: <201107290910.p6T9AJUG004370@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1643552409=="

--===============1643552409==
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-wl-5710/ based on revid:saikumar.v@stripped

 3481 Saikumar V	2011-07-29
      Fixed one negative test path.

    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:46:04 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-29 09:09:16 +0000
@@ -10,10 +10,12 @@ 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
 
-#Gather the mysqld path from the MYSQLD_BOOTSTRAP_CMD line.
+# 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;
@@ -157,7 +159,7 @@ let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN
 --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
 


--===============1643552409==
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-wl-\
#   5710/
# testament_sha1: 5d12326e284f15515729ed1fc95866d9e929fcd3
# timestamp: 2011-07-29 14:39:19 +0530
# base_revision_id: saikumar.v@stripped\
#   sgnsyvynxv8gh10e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaxhldkAAaPfgAAQXGf//3+n
/6C////wUAQm3kq3vdNGr3HuOEoglPRgmjCNTU/SYjRG1Aek9T9U0emUe1QeoEpJkNNE2gJkmTQ9
QDQAAAAGgSkyRpPUm0mQfpT1NBoMIDQMJoAABiiZT0mCTamngo9TQABoADQADQSSRkGmk0ynkGqe
kPRHpB6JoANBoNAkzNirbxqKalgoxUJBO6QQdJW1zcDx1WGO/rg8eWq/rd7Mv0tVVCHgEbolMlTE
yNgejqN34tPO+T+Uc3ejVVefSE52PM9Sxni9XyYZlKWLFLckqJbFS2dwbCol8HCuHDW1EaXCFIwl
E0D4lKgSltK8Ax1YjTTbZPExEHTo9EJpV3vsfCCVTbmnFTabgT2cWUBk8ShaLnBUKdYdtBMEGPvQ
SVIyezYdNAlrI4hv8tIKslCiL734MJqE5ygZ9uWTMgEUOwWvRaF/zUW2KHrnyENZJHLkzgk5RjbQ
4ZvKreIXVzhfNMNHqkiMtUdoxeka2WOmuhFmWmE53OeEDSSS2jaDUE01jPM6MC5xDVrriVmULqx6
qmy3xF8MMkSoFCLU8FXJFcUWYQ2k+el6PeJjdeZMI00tSq3N0C2EZ3DUDtm2wMoBCt0WqKqcwgJG
IiiXCg2hhLD6nTNNstKi0XBdWyaiwVo1umrUKJFPwkMcIAYIL23RbwauOVVbaN4tV/Lv3Ej3zC6f
xmnVFP2n3U48hhwc4IK8Dtl/KV5eg69h+TiWqE3MoPyTF5ck8yItP3JONM0DkqPpIme5ZAXqI1cC
O/VpYwGbQu1XQB4MDbCP8e+D4jz/eT91N20Eihl3DXBnYiF1ED8G2FUQyRIRjSRqM37+3y6Nh35d
10rpmPLBvz8PkC+6SNgbPovstckSPAkSTNvT2HZKomov7pUIGIpphkwUavdJ6iaAbA3Dh41dkij1
u1NciDFrEj7KRhUeZoj2a4O54yLCFpCYpYc3pRstNaY9LCZTlIdVZw1dU66b2JjM6Kk5jrdHmpqp
0rWWPQWymUHJoe7Ed/drJzY/LncikqfvhLcxFm+14oyRYHiFsxDhiZtzg6dHoJyTXIaxbCwxxetF
c59qTgmVO1xVOJUHSvFF/c2R1ITIRVhotx7aJbRa+szObMOUFTTx6ttYPB7gnAhUkMYXCVZmMfHJ
BqiV5ngjATUR18pi/hI4YTk14KNv4VAMB1iEaKKijDCGprGO9a3YgIPQCRRtA2qRjkVYBeBHc9wd
oJDSIGphvw2sy2a01aRRaMGkFTkRrmubHmBhRKCKrIksgYSKmnpDDQSIIDie9zCJMtIdPDEkjJ78
hPPkEVUhwtagI8lwa9sJF8cuCOsNdrQUuwpB3G1d6zeIsSqRyg6WgK5+E7jqH5Tum5pX9a6HDUJx
F1XgtJpnqIV2JrHbI1zLkuwnE8XSLlt4gpZkgwSLJKMZBVkF+OG2as9JSEQit1BsBwjSF9Rok/xd
yRThQkKxhldk


--===============1643552409==--