From: Saikumar V
Date: August 1 2011 9:51am
Subject: bzr commit into mysql-5.5 branch (saikumar.v:3484)
List-Archive: http://lists.mysql.com/commits/140490
Message-Id: <201108010952.p719q3iR004812@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1700808907=="

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

 3484 Saikumar V	2011-08-01
      Added negative tests for new options --mysqld and --my_print_defaults options.

    modified:
      mysql-test/r/mysql_plugin.result
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/r/mysql_plugin.result'
--- a/mysql-test/r/mysql_plugin.result	2011-07-29 15:47:24 +0000
+++ b/mysql-test/r/mysql_plugin.result	2011-08-01 09:50:59 +0000
@@ -51,11 +51,11 @@ ERROR: Cannot read plugin config file da
 # 
 # Attempt to use bad paths - mysqld
 #
-ERROR: Cannot access mysqld path '/not/there/at/all'.
+ERROR: Cannot access mysqld path '/mysqld_not_there/'.
 # 
-# Attempt to use bad paths - my-print-defaults
+# Attempt to use bad paths - my_print_defaults
 #
-ERROR: Cannot access my-print-defaults path '/not/there/at/all'.
+ERROR: Cannot access my-print-defaults path '/my_print_defaults_not_there/'.
 # 
 # Missing library
 #

=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-29 19:05:26 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-08-01 09:50:59 +0000
@@ -164,6 +164,21 @@ let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN
 --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=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=/mysqld_not_there/ --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 - my_print_defaults
+--echo #
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQL_BASEDIR --plugin-dir=$DAEMONEXAMPLE_DIR --mysqld=$MYSQLD --my_print_defaults=/my_print_defaults_not_there/;
+--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=$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;


--===============1700808907==
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: 868714de995c2f2a34a48da4c8f56dc420c19be8
# timestamp: 2011-08-01 15:21:03 +0530
# base_revision_id: saikumar.v@stripped\
#   8emsboltih223y03
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTuqVDcAApVfgAAQXef//3+n
/2C////wUAXe9bWABtjWkINAYSSKZMmU2p6mPSZTap+RT9UzIQDTQeoaGageoOMmTTTCZGQMCMTR
gjCDRpgAEOMmTTTCZGQMCMTRgjCDRpgAEEilGp+ijI0xAPSZMm1DTI00ADQNNA0EkgIDRMRoNIkM
yjRtIaBoaDCPUaKM2OPQjh8Gf7dPhq3LjdX66F0epWTVLeGMCsSZdGcz5kLBTjArC7zOcBlJa6yG
Ys3OSSQMZOVC8MbbCb+Bbs8ZU2Gd5puJfsRj2RraTPaI3r1XzmZdeb714DG/8cYn9aaA+X+4nYh2
IHKRgyK1XXwhEWRaJzZJeD2EXwusgmDQygukFatExSSiIYFUM6FbAmPyMUhWEewcIc5nC0kp5nmo
2y6aQ7CqiO60S7MRWITwoV8oDOjfIkhatfdQcBqgI++oHkg6GIDcJoNq3AiwGVSzcV+7wKCmNJnM
nVM4+TzVoRADY6fPjBBYDAXxlgQwnnpa+7cH3K4MV/d7nsbel20AsCme8eULzXeZ8TE32MEYfD1H
kQFC2ZG7vH/KG64KviAwbuPOhDANevTCtGG7jBHI206njGooDmpbO+N3D4hsUfDDUiV8gH3C2CN4
FAP8c4JwnMfCBRIqHxOLcSvCdwywaKi8c4qsRHW68DMtoDeRHBw8qkYGdxInY4cROdYEsH3HEwfO
xh4zM6YYv7TsIXrUH78uDd+q4aBaaY8HNvGxa2ARL3CsAsi7fDnZbgVYUC0yGwIWBgwGr4EDVON9
cbHZVE+AVVjILawuvcDkNEdnQDInHBpvBg2xIldhOADtxkej1E7byTrn8LXaSaV7k6bBxiiEilRG
V4c2JT9BPU1xvebwDW+NhiIW5yg9FeCFynAoP0WBcPO+7Qs0BhmG/h3jB3MER7veH7EFIYkSJAVY
l0yw/UkVeJ7zdUB4pZHiSYej+gqLjcC3f2eI2haF5AHkVMMgUxROIX1Fo+JM/wE8NXlYZ2Bo4hrY
UQoGgUBjUkKaqX0uE3BwIIul4tiypSUvGCDBAWOXBRHJhNFX7zU9ngJVXK7AqIRR1chezQl6yVvc
eHrZColQcXj0O38oGbb3HbxqcT/AdOe+ylbz5yFYdmo7UD5ib4x0Lxqis/72HZ2xFVKUHCVBKEgH
1Adz2qGgrzDDzFsOJWEgauKKwszMzU8th4amq9SmwZS7VAeZTHl4UGdMb2EsAY+lVBseNc8dA3GB
RhtYdMY0U9W4sIC8uWnOX7MNDEYGsyQq5sbZuDjdaVKUJFzpgzhyWRwDoz1F11ZbIhmnVoyKtZKR
Ijro1aC06LLywBykfSuJ0nSTUuWQuA+3hyemGsWoC/TpOfmBrRUgDxScnZJOubqFxlbsho9EwYCX
ITjf3AaIvtA+PLKGaKy4WaOx+cTt9D+Qar5eCPPzEq6tqweiyjw6gPkhbFRcJMG45tV1CZV5weBW
Blt0iJREuatON5rK8jFMOWLBwA2XVe0n4OYZoQZh4wWqxhMKBZeA0EPgzowPIdAkRuZJkNg1cr0C
sqxQG6kohsDsskKwybQJTIgtuCxFhzt6lnFhgZD1HIHG80Fbwe9Kp8VMu0tAOehE1ZnLMLXoTyi7
w3imkGsAjJL6lj2aKRboBYtz30O4JKQSMlq7MYcyNPfCgdTsTDu6QUu5LQkc2Mjihjy4B81DzAFq
CpDAzFmhevLkwxpe3dNyCHnBqggOfQNlWdENIsBgq6QCheRjNWouXVqh7CreHpW/TbvmB5a1eB3i
WwD30XaGiFdRWd/JFrfVy7MEE3RD0gyHWb9zGQOSliBwBTGpYAS0f8XckU4UJA7qlQ3A


--===============1700808907==--