From: Saikumar V
Date: July 26 2011 3:33pm
Subject: bzr push into mysql-5.5 branch (saikumar.v:3426 to 3427)
List-Archive: http://lists.mysql.com/commits/140475
Message-Id: <201107261534.p6QFYsU9007770@saikumar-laptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3427 Saikumar V	2011-07-26
      Testing support for release binaries on windows and non-windows platform for mysql_plugin test.

    modified:
      mysql-test/t/mysql_plugin.test
 3426 Chuck Bell	2011-07-25
      WL#5710 - testing changes.

    modified:
      client/mysql_plugin.c
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-14 14:37:37 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-26 15:19:15 +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

No bundle (reason: useless for push emails).