From: Saikumar V
Date: July 26 2011 9:03am
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3479)
List-Archive: http://lists.mysql.com/commits/140472
Message-Id: <201107260904.p6Q94qqP030945@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1867275895=="

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

 3479 Saikumar V	2011-07-26
      Included changes to support release binaries for windows and non-windows platforms.
     @ mysql-test/t/mysql_plugin.test
        Included changes to support release binaries for windows and non-windows platforms.

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-19 14:35:03 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-26 09:03:46 +0000
@@ -15,18 +15,16 @@ let $MYSQL_BASEDIR= `select @@basedir`;
 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
+   let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/bin;
    --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
+   --copy_file $MYSQL_BASEDIR/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
 }
 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_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;
@@ -226,15 +224,13 @@ EOF
 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
+  --rmdir $MYSQLD_BASEDIR/share
 }
 --enable_abort_on_error


--===============1867275895==
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: 4c8516ec84888ed501022db6925707ef9ab70c1d
# timestamp: 2011-07-26 14:33:52 +0530
# base_revision_id: chuck.bell@stripped\
#   2ykoonmu8ce5iizz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerXwAkAAdTfgEAQVGP//3Ym
OSC////wUAR4vauCxyUAy0JKSemVG9I1H6CMjUNGnqGjJpo0NAAyIk2CaBR5DSaaAAAADQCU1NJi
jQpvaqfkympnqjRkaaaNpBmiGBzAJgBMAAJgACYAAkkmmjUxMRiNJgU9NE0aZGT0nqYmh9rePHwi
n7sOsxwvpog6bCr7A49MGaRoUXxsi7pi5kjwOI8TM9hSQYXXpJm4ftjO+2WhXKt0nZ5wLFScKwId
dalx2igd3nG8vgThIqQNwhyJbrlk+0xEhQSKGA5cBGRcILDoHWsp0to95Koihxk6i2jDWEyRJ0Cd
FiWfyIBWYZprJYCfdOK5g2s7qdnlJUJ6saFSvKM4A4EmsduHDa9rEkJDpcnVzSANxr4TIUV0qJYT
UzZdOFWReJmD1o3X1XHe7bS+8IK+SFr3bNV5PLSBlFtKjDmYbntexa9DTfAViSNjSa0k7jZVt00v
RtqAPeIOMzBzNGZdGJ2RhQNpR9KtniwQBrqsaHMF5ExwyWVJc4TAGSJQTaxUE7wyoUlt7ZxO9dqA
XISrqGLhQDpaYSvrpY8FXhAbAlE6Tum/Xv2RlRdcZWJVaK2QS+jOBghAV5CQUwuxwEYI8tV8XCoD
COaSbTbAMfEFScRdsYK4ak/HB/KDrXO1wV7GAVKtd+SnOI48oqLPB5wcoE6LoPqZ9By7tSymjPf7
cAuS0iJ6mGZvcR6JHQT/YR0EbD2EcxDxHqI9RHuIhp9xFBkGGDyKTRi4LkefJ63uDa/EUx/uXn4p
EN5BxIGhyXlXlluMpV4Mk4VKJigeWjZOfXq/WbY7glLycu2l6Bj2DNg19lMN2ykuUCuy3kMQQcDZ
EhxFIl8jNWJ0yea6roDVEeZ3JsqibeBaT7TbziEedmYylgyE4G479gH5LX+cS9Q3cyFsIm11JAMT
lIUnEqmrJt0mSzK19kYdTSerrjiGrkSHmmL+Ucc9rw4s5lGWjhMZlIBIsFd8bGYDffQXExvPiXsb
u2DA6sa8OvkKB2IY193CYi4cDDCj3CzieFQob21rUU5qWTSEu47VaBgk8u2o0hgHQLKfjHB+gKze
YhPvlfrWnxWoUOOIPUAJ9hODgi5fDgejYWTBSkMpjQaDVneG5slEShGqPeIrE3EWQDcFVhYX4Tyy
kDwYOCkOPYznT5IpkMwxg4yegw4B7DjAg9QJESsmXHONVeCflGWuK+SgQJj+pEQcjSnKbVvDDGy9
mCQomtUpuRQsVP4imKnCiKgDXsvNJOXJyVa709JdnzlFmGRXwkJ89hRuRFoVsv3tQJCQc4dI4hGR
Rem0+J8hV6aXD0DEq5dQaIQ6tbZzG1cQGoY0hgLeDmzaXBVysk+kH+A8zOdbQFm11Y6Iactg6UiF
K3tBlVjoWZGRmgMaWm8CZXLsoSxJ9oPriVlIaulPVS5Ry61YFwGNpoZrMnbIv+LuSKcKEh1a+AEg


--===============1867275895==--