From: Saikumar V
Date: August 2 2011 3:19pm
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3483)
List-Archive: http://lists.mysql.com/commits/140515
Message-Id: <201108021520.p72FKwo0003774@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1676777527=="

--===============1676777527==
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:mysql-re_ww@stripped

 3483 Saikumar V	2011-08-02
      Changes to test mysql_plugin with the new options --mysqld and ----my_print_defaults, and negative tests for the new options - latest update.

    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 14:43:54 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-08-02 15:19:52 +0000
@@ -7,29 +7,35 @@
 # 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`;
 
 --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.
+# 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 the mysqld path.
+# 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;
 
 # The mysql_plugin tool expects a directory structure like in the installed mysql version, so errmsg.sys
 # will be copied to "basedir/share", we create and remove this structure. 
 
-let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/bin;
 --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.


--===============1676777527==
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: 7a0ebb9a5b242c628012922f1d656f65644dc7bf
# timestamp: 2011-08-02 20:49:57 +0530
# base_revision_id: mysql-re_ww@stripped\
#   krimeeph1m3ziz0m
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZN0nGsAAdVfgEAQXGf//3+m
OaT////wUASaXp2zTuq3bh1dm2w0QInqZT1PTTU9J5pGpieo0NNAxqNNMj0mQMo0JNiTyRqNqbTS
DTQAAAAAAkiaJomIU80p6aaamamIGgAAAAHNGTEwATEYEaYEGIwTJgEYJJJkmDSYp4mkam9TUxGJ
tQZDQGJ6mjRbdho3SptTfeJfTZ7TaXLYy5Ne28CrJTk1OR902cpN4WhAyRavyrk9nZYdFmMwQM9/
yRPx3jSIXlrQ4yYy+maYICzUb59BhAMvW6L+y3IpV+t25W+qpL87HNXlrQ9StI3cRHOM2MWzMaOQ
Vuq12nh07p7tuvucSsn0sjpH+THiY1Mc9trZPYaZuWw3iNeo0ekULWxwUI5TrZYVW6qIyAsStZwN
PXPClL4nRBVjR3WdO2OomCdlDoNJTpIIYFRMtTrTL/K5KGSuabM3Dy2CWww71haMJSjFGZ66Ye56
mhzkj9Q3Jg44G4VMTlzLyCBoBssE2DFJuY4FBodOK9+QLFOYTQp/dBbAmW4dTTwilNJdSEz1VjMy
cyn/SRnK3yK2d5zAny8RQdHFTwsqOq4jhJjhSVIyHvJkQxCqGfXUzvu5duRcKYseG/GWEKduDjkl
dcQvDW6qkY2tL32imUrYzrOC3VbikJpqMMmB71lLNMh9ka2KmTCOelsOq0uriGIt9dljVHLGUa3F
iNWeWYlIYgjVK/Rl3LIge/LkaeDjhSSal48BoDz5t8JeE9YlyufiOaswt9umpuvJoIyKkhBEZGOB
CjtZkeAQ3ogUjjv70b1+mLyX8hoRBDyk8EbzyQiuBJA/qC0wcYoGGyyXEpAHl4gLZqYTCx7FAegZ
mzd0B7+s1SHd9IgqK+3skeDbWA+OzUsJZFf14MA6KH3HSsTzhibNQZe4n54HCDSM410sg0AFUHNG
sSXFFyoc46DNI96Rj8OiBxWZocf3Ymjo2l9ihaH2EK05u3i5gS63etFX5oRNtD26GgG1q0vlcndn
CbFDd5WPTFS2wAicKb8xTV0wG8guygOkBQ8yTktQIRsjGAjJRfwxQzTRt77oeiGGQmEzZFYXk703
rFLnzZ9HGYcLiYrLBcv9jztYxYx0FBiww3jXbah87uoHejqqOem1OcHmzwrf0WiH6WmN3EOjVgml
2lqC4O9o0KUxzDUFkDfrvfgE5WHJkHNG7Ttm5lRPr7TiUMgeKhZoJtk7BAJAkcEgYb/tILFmSGVN
Xn3c0455VvlmDtV6hG/xp6IJK3sGGqWzBxlNLA4uedY+bQBr+luHxTRPKLkyo1z1hAHQYeUWTIkz
AzJl1c3btt3gqBwYggiw4JFgOFyzC/JGmxSirKwLcgMiEGsA9iJQ4aQVQpeCb7BGUtJAJF3HAoJE
7B2QlxTIjtsIWWK4oCtRjLDcTBoCvlOom0yuGa//YF2ZmM7pm1lB5NChcGUhfQ8H9udeLwZ9QlnQ
XA1r+sljxylTXDBjPULv1kdhQrEp50iZoVIHIAvLfMXhjGwAiZ1LQQehhYwDRDXIFNoqOSSIuMuA
qiqsQ1VcApDrT91RrW4lRnip3ZmocSjLQrBO52LRH/F3JFOFCQk3Scaw


--===============1676777527==--