From: Saikumar V
Date: July 29 2011 7:05pm
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3483)
List-Archive: http://lists.mysql.com/commits/140517
Message-Id: <201107291906.p6TJ6XYQ004231@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0796380969=="

--===============0796380969==
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:chuck.bell@stripped

 3483 Saikumar V	2011-07-30
      Fixed test further to remove references of MYSQLD_BASEDIR, beacuase we dont depend anymore on the --basedir to contain the binaries

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-29 15:47:24 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-29 19:05:26 +0000
@@ -26,14 +26,11 @@ EOF
 source $MYSQL_TMP_DIR/mysqld.inc;
 remove_file $MYSQL_TMP_DIR/mysqld.inc;
 
-# Here we need to test : if /bin exists do the following 
-#let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/bin;
-#--mkdir $MYSQLD_BASEDIR/share
-#--copy_file $MYSQL_BASEDIR/share/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
-# else use /sql
-let $MYSQLD_BASEDIR= $MYSQL_BASEDIR/sql;
+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 --mysqld=$MYSQLD --my_print_defaults=$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;
 
 --echo #
 --echo # Ensure the plugin isn't loaded.
@@ -148,7 +145,7 @@ EOF
 --echo # 
 --echo # Attempt to use bad paths - datadir
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
@@ -162,35 +159,21 @@ 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/ --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
---error 1,2,256
---exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
-
---echo # 
---echo # Attempt to use bad paths - mysqld
---echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS --mysqld=/not/there/at/all;
---error 1,2,256
---exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
-
---echo # 
---echo # Attempt to use bad paths - my-print-defaults
---echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS --my-print-defaults=/not/there/at/all;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQL_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
 
 --echo # 
 --echo # Missing library
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_soname.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_soname.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Bad format for config file
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_format.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_format.ini --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
@@ -204,14 +187,14 @@ let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN
 --echo # 
 --echo # Missing data_dir option
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --basedir=$MYSQLD_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,139,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 
 --echo # 
 --echo # Missing plugin_dir option
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQL_DATADIR --basedir=$MYSQL_BASEDIR --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,139,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 


--===============0796380969==
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: 91e5e5cbca9106b844311cb3a31fcefbc69a4340
# timestamp: 2011-07-30 00:35:31 +0530
# base_revision_id: chuck.bell@stripped\
#   xwfx58w9ff8eixyg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTOou9gAAldfgAAQVGf//3+n
/2C////wUAV497nrlnvAnDyhlkeElAmip+mCZqZKep6n5Seo2iDQA0NNNAHqCUp6KbTU8JRvVPRP
UANAAAAAAAYkBEJp6j1NpDIyGgGjQAaAA0CKUCahiZNqNDIABoaAABgQBJIjQ0ExT1PRlMKfpTaT
1DQAAAAFy/eB+E3q8V61nbKsRuq0SXRZnTCV6+z3omEPjS+QBhuImTZdf3YDkYjIS5/mGJEAb/ht
olIziKUTbg6rU1XPrfBwsVaNDSfGAliaAXXnsz47MNTD10OjewRoc02JWMSUlvvo6bW+W4cwg4iG
SGGAZJhstrgNyBiBSkyCZCyVx5FbQ0REEiupSOOUDWwZhYXup2hsBVfcrViTyu9pgwtcSfG2aCiC
0Zmy7WaAn66BRE94lIvinKubOJKBuKidjGATs1TLVpcNgiaBPYg4EgPhW7BqZbnEVjb7JzFB3xFW
BYuSqki0z9MXeHFrhSG2M2ScW13l00xt5gVE4x+YpimWLCcGoUMMrowEX3hfMSEVSRdAnfRfBTyw
P2OvYoaprCaVyKbNdOkRVWNM8KB6WyW2kJCZrlWbihzDLHdHVYKRuDwQDvz/4KX2vxT9ey+EkrqI
zqnIddsmy3rq1FKJfcW3kVyRXOMbSEgUQuHtMU1mkiD2vI4WDBy2SgFwlpMK8ONzERaiQV1CNZRy
pKBgIa+nd0AWqnUsmpAutTqqOmwT0VKTQEwJTXsTvcA2MnMt67ZjYpgvpCwDgXgJDbw4L4cS40sp
lS0u8jKnstqqGDOCe8L9LiX0SUH4SCeIGCCCAnVrXkdFaEsnklCVlw5lxLbXQQcwpmSdYWQRyLSl
dLS78AJbXKuZIWpLqyrIkwtZagBoQalsLCzI5wBkWuXJkpKVqXSXVWUlWddOlLCozLciIhCwrMBb
JgQg4E3CULwyE7wz5HuewHY7EYk7/hITRYDnD83HDL/debPzEiirsGompBumEQMDEvzVhvERw89t
JSVaJ+VgEFWkzrS44nvOUxIyG8Tr+gF1GvsCn4u2i8/uSJ5y/QortPm7PvaXGWJt1MziFkwOakPM
EiF8oENRd8o4SpinJjV5EqFiqRbC99RaZJWv3nbNQh4NSYNhq7uavmPq13Zg5I4PNYwd9jPDRx2v
Tumi/Q5uiqA0uqOcC0DRpCydi5K7feHLrp5Nt/Ti4HlE4m4cXGaZV9Bg7LW82Y0EcdxnOhswKw0J
FJvm7xuJVh3YpbBw3aFhV/efhmx7OIzxhkc/VowYDOgFRpz1z6hOclmVsnhMahD723EhtGjemlk0
HCtAxBxg/sSM2buGIavAVFSX8zwh0hahHHYHH7bAhK7aZihyyDaBP4uFAPCLgYJBEpQkNvG1AZZu
nDhPRyE9KJEFvjKkSgbApMay/KawwaaYY4nA0CRMMu0nAm1SiUiEkAliadLBkA9MgIWB73kpkWRR
hjqFujGDWAWkagr+xhjMLQSKQJ0hseu6W9UCqzFmTy+DDjADBY1ZPSnnrpBZ9OsarAck1dA9IJ0l
lBsBpcNaine8fVCxKIUlcH9REtZEN42IGHK/A3jLuEwp7UDHuMG4sunTwb01re+rUCpSoR2DgK9t
oTufyZwHaS4EiUj5K8orrcMxnSURfKKsfAiFK4tBKZy6JL+0ICXGpLvgRf1FqVlSnwCfwhbgGdIQ
LvIOUgPDoXMWm9KgKyeIaCUeZkP8XckU4UJAzqLvYA==


--===============0796380969==--