From: Mayank Prasad Date: June 15 2011 8:02pm Subject: bzr commit into mysql-5.5 branch (mayank.prasad:3453) Bug#12561297 List-Archive: http://lists.mysql.com/commits/139277 X-Bug: 12561297 Message-Id: <201106152002.p5FK2s0M030664@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0950417946==" --===============0950417946== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/mayank/mysql-tree/mydefects/5.5_12561297/ based on revid:dmitry.shulga@stripped 3453 Mayank Prasad 2011-06-16 BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING. Issue: ------ New test case mysql_embedded.test was failing on pb2. Description: ------------ To run this test case executable libmysqld/examples/mysql_embedded is required. But as per /libmysqld/examples/cmake_install.cmake this executable doesn't get copied to when mysql is installed at .That is the reason it was passing in my local branch and failed on pb2 when pushed. Solution; --------- Added code in mysql-test-run.pl, which will try to see if this file exists.If It doesn't exist, test case will be skipped with a skip message. New code in mysql-test-run.pl looks only for directory libmysqld/examples/mysql_embedded because this is the only place where this file could/does exist. @ mysql-test/mysql-test-run.pl Added new variable for mysql_embedded executable. @ mysql-test/t/disabled.def enabled mysql_embedded.test which was disabled earlier. @ mysql-test/t/mysql_embedded.test Modified test case to first verify if mysql_embedded executable exists. If it does not, skip the test. modified: mysql-test/mysql-test-run.pl mysql-test/t/disabled.def mysql-test/t/mysql_embedded.test === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2011-05-30 13:55:44 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-06-15 20:02:18 +0000 @@ -171,6 +171,7 @@ our $exe_mysql; our $exe_mysqladmin; our $exe_mysqltest; our $exe_libtool; +our $exe_mysql_embedded; our $opt_big_test= 0; @@ -1950,6 +1951,8 @@ sub executable_setup () { $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); + $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded"); + if ( ! $opt_skip_ndbcluster ) { # Look for single threaded NDB @@ -2354,6 +2357,7 @@ sub environment_setup { $ENV{'MYSQLADMIN'}= native_path($exe_mysqladmin); $ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments(); $ENV{'EXE_MYSQL'}= $exe_mysql; + $ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded; # ---------------------------------------------------- # bug25714 executable may _not_ exist in === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-06-15 03:03:13 +0000 +++ b/mysql-test/t/disabled.def 2011-06-15 20:02:18 +0000 @@ -16,4 +16,3 @@ alter_table-big : Bug#11748731 create-big : Bug#11748731 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists -mysql_embedded : Bug#12561297 2011-06-15 New test failing on all platforms === modified file 'mysql-test/t/mysql_embedded.test' --- a/mysql-test/t/mysql_embedded.test 2011-06-13 18:41:24 +0000 +++ b/mysql-test/t/mysql_embedded.test 2011-06-15 20:02:18 +0000 @@ -3,4 +3,10 @@ --echo # --source include/is_embedded.inc ---exec $MYSQL_TEST_DIR/../libmysqld/examples/mysql_embedded -e 'select 1' + +# Test case require mysql_embedded to be present +if(!$MYSQL_EMBEDDED) +{ + --skip Test requires mysql_embedded executable +} +--exec $MYSQL_EMBEDDED -e 'select 1' --===============0950417946== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mayank.prasad@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mayank.prasad@stripped\ # vro8cdbne4rpomfm # target_branch: file:///home/mayank/mysql-tree/mydefects\ # /5.5_12561297/ # testament_sha1: 817ca2921ae22794abd6eea7aeba12647b54bd86 # timestamp: 2011-06-16 01:32:44 +0530 # base_revision_id: dmitry.shulga@stripped\ # plmirk1gfi3vapvu # # Begin bundle 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 rmoyIy+A6AjXiyqs/xdyRThQkMgWwP8= --===============0950417946==--