From: Saikumar V
Date: August 2 2011 1:38pm
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3485)
List-Archive: http://lists.mysql.com/commits/140489
Message-Id: <201108021339.p72DdVDm010128@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0975917794=="

--===============0975917794==
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

 3485 Saikumar V	2011-08-02
      Corrected error message file path to be dynamic than static.

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-08-01 09:50:59 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-08-02 13:38:26 +0000
@@ -7,28 +7,38 @@
 # Add the datadir, basedir, plugin_dir to the bootstrap command
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $MYSQL_BASEDIR= `select @@basedir`;
+let $MYSQL_ERRMSG_BASEDIR=`select @@lc_messages_dir`;
 
-# 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". 
 --disable_abort_on_error
 
 # 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.
+# the mysqld path is extracted from MYSQLD BOOTSTRAP CMD line.
+# We also extract the path of MYSQLD BASEDIR (where mysql exists) and use it for the errmsg file.
+# The directories differ between Windows and Unix but the below perl script
+# will pick as per platform.
+
 perl;
+use File::Basename;
   my ($mysqld)= split " ", $ENV{MYSQLD_BOOTSTRAP_CMD};
+  my $mysqld_basedir=dirname($mysqld);
   open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/mysqld.inc") or die;
   print FILE "let \$MYSQLD= $mysqld;\n";
+  print FILE "let \$MYSQLD_BASEDIR= $mysqld_basedir;\n";
   close FILE;
 EOF
 
+
 source $MYSQL_TMP_DIR/mysqld.inc;
 remove_file $MYSQL_TMP_DIR/mysqld.inc;
 
-let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/bin;
+# The mysql_plugin tool expects a directory structure like in the installed mysql version, so errmsg.sys
+# will be copied to "msqld_basedir/share", we create and remove this structure. 
+
 --mkdir $MYSQLD_BASEDIR/share
---copy_file $MYSQL_BASEDIR/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
+--copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
+
+# The mysql_plugin tool now accepts --my_print_defaults which points to the executable my_print_defaults.exe
+# we can get this path from the variable $MYSQL_MY_PRINT_DEFAULTS.
 
 let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN --datadir=$MYSQLD_DATADIR --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 
@@ -239,6 +249,7 @@ EOF
 --error 0,1
 --remove_file $expect_file
 
+# Cleanup the share folder in the binary path.
 --remove_file $MYSQLD_BASEDIR/share/errmsg.sys
 --rmdir $MYSQLD_BASEDIR/share
 


--===============0975917794==
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: e501ebe24f53e5422785db24ee568cc17223d97c
# timestamp: 2011-08-02 19:08:31 +0530
# base_revision_id: saikumar.v@stripped\
#   373fx23l9czmuncr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa7KglYAAhZfgAAQXGf//3+n
/6T////wUAWMbG93QtWzkDms7aPCSRNNNJpMMJpimCAak09T1ANAemo2iPUCUhMNJk0nqNT0o0NG
mgDQAaNNABoA00IQm0mk0yhhmlPU2oeoAGCaMGTI0HGTJpphMjIGBGJowRhBo0wACCSSYjRqaNKf
p6qNNqemUeo00GnpBiBo9R6hoEqn/LRhPeouGe/0/O5thmUZSds+FXrtoGslImYSZzbduMC8Cb6h
6Fmw92Cdlhy7qftH1/3AUQE6uwI0sO84nCEMLD2lSzqAcSyoV/UqxhFlIdOWrSPzc2L/6nTLsXDL
H5Uqbtfhkeo7ikj3kQmsg0G1kV1XUeF9ZyDkb7aWECmbKMHVhAm68oyWSj15aY4wOOz6bG6YdOra
ZZ0kOwstoNMuNPLdS6nsVU1o9Hcgd/bLxYix3aKJXynzlgjtCwvPshJnU7Me+4Wkqh561sjF6R02
cVoWlIr5xq0z6Zoz40DMLmyyYHt12Me8cE4KFbxRYrB31kBKZgiN8qkIbI6RQKZCOT9uI6Al9ErK
EpYVFMZutcWqqkEohqKc99kCYwjrpKyV+at0IjSneLFXGw8s/POXR32lzbkUm7Mhlq3tgjCgjHrE
jhblBobxNcGDnxswVF2I/pFkKI+hzJznymnm2vnh7D7JhVTk2qsGEhPJDboFQ7Sl4lUHPadWYVG5
nDuG1NtFzYpUrXqXkFzChwh1lLy3ZhYbCb4vm5gkct5SycA00WJ3cc8kalJBstIUIO5F3TSdnIpN
ghE4nuxEiQ1VZ3ffBjI1Bo3S+NA4Ia4UG7WgtdVc9uG9rls7TayEnDTMmnqQ6BSEaGp8bfpt8C7r
6MZG3sYhRT+XOn4ckivSj5TMrDFfaDcfU4d9TfCCKlXuR1QIWDy2cUcA9PVy9IFB5ozR1fL+ps6U
EevnSaR8UVn0SfbK2r56VJgkA3D9UGukp614Ts69O17g6ehECPZFcu/D0+wiHtNxYn6P90Vxx+OS
CSv0CNHAziYiCqugN02Sek/L72IhBZ0eNMbF4RJbaEPz/sT21i9pfpft/X3r9zUFLWnN33oWBRIs
hH/sXRvYczJH8JGaP8zpzbq4szDNSN6C4hFGAmqlF6lwU2SdHQskUyDhxYxGFmQW2JFRySvWv21C
3ddnG3eKqRmlyanpZywCnQW0PayogJ71z5cYUMKsuuinwbpk1boUB0Opmc5Y3ROqGFi0nDq1vzMb
ay7m7TBu3/XFWVL3/F5kmVhXfVc2Gy/NDfUzNU+/BsVIGxJteoMKVFMR4bCuuTzruO+Cm0Lr9qju
bcxoY5MNzDaHZuF3oU/giWXPMrmZqXMDmTHkyYYM/aONCQ1zbzpMn8XzdGe5M+afqXGwFij4toJy
5ckcMA91Nk+dfPq33z4In1pUbCnIN02GHEVMcvI3rl3cAcCjHxtHa3mWYIhBwbQgjZ93Ilb4GZi9
IZb5W8XChr22EHctjsknmVHillBYtAE5WKfJS8fx2X1RNEgw7wXeRlFh/yK9yQnevBQNswqFK4Uc
cJYALgqFGAJFBlVrpcOwwMMq3Lmocg3oBX2cUyt5qBSRSQ8eNDWkTIcG+Twlux6t/bsm16ulmTIe
XuKbhzm3obok55RbGOjMJcL4EHOdaPSIzK8coJFAwcp88XOa8JUDcsEK8bh0rY5pLBwTCdd5KT+k
jJEZEZNidhHHI/Eizwqan+os4bTaM7mxlQmu1o3BkcbdErjGIP3YLdHfqtEZ2WpLg0+gGKneSwhr
yofG2Z+xa5/dQ5ciFDJ9Vh3JrPlGiJwJtLUwKnotCU2Ya4dUYPqte0qlhAw0QIo1XnqBUC27Oa82
y/kNCQ/GSdfgGSA8u53LU/HOFh0kBOeJhZ8UZhUqIlNCqQqSMLAt/i7kinChIV2VBKw=


--===============0975917794==--