From: Amit Bhattacharya
Date: April 17 2012 10:08am
Subject: bzr push into mysql-trunk branch (amit.bhattacharya:3882 to 3883)
 Bug#13541194
List-Archive: http://lists.mysql.com/commits/143575
X-Bug: 13541194
Message-Id: <201204171008.q3HA8W8H018408@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3883 Amit Bhattacharya	2012-04-17
      Bug#13541194: - ADD MTR TEST TO RUN EMBEDDED SERVER TESTS IN MYSQL_CLIENT_TEST.C
      
      Added a new mtr test to execute all the testcases for embedded server client. Added a .opt file to support it.

    added:
      mysql-test/r/mysql_embedded_client_test.result
      mysql-test/t/mysql_embedded_client_test.test
    modified:
      mysql-test/t/disabled.def
 3882 Yasufumi Kinoshita	2012-04-17
      revert "Fix for Bug#13798956 : fix for flush_neighbors behavior to flush only contiguous pages"

    modified:
      storage/innobase/buf/buf0flu.cc
=== added file 'mysql-test/r/mysql_embedded_client_test.result'
--- a/mysql-test/r/mysql_embedded_client_test.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/mysql_embedded_client_test.result	2012-04-17 10:07:36 +0000
@@ -0,0 +1,5 @@
+#
+# Bug#13541194 : MTR TEST TO RUN EMBEDDED SERVER CLIENT TESTS IN MYSQL_CLIENT_TEST.C.
+#
+stopped the current server
+# 7. Restart the server and cleanup

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-03-31 17:48:53 +0000
+++ b/mysql-test/t/disabled.def	2012-04-17 10:07:36 +0000
@@ -16,3 +16,4 @@ archive-big              : Bug#11817185
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 ds_mrr-big @solaris      : Hemant disabled since this leads to timeout on Solaris on slow sparc servers
 partition_locking_4	 : Bug#13924750 2012-04-04 lost connection.
+mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing

=== added file 'mysql-test/t/mysql_embedded_client_test.test'
--- a/mysql-test/t/mysql_embedded_client_test.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/mysql_embedded_client_test.test	2012-04-17 10:07:36 +0000
@@ -0,0 +1,50 @@
+-- source include/not_embedded.inc
+
+--echo #
+--echo # Bug#13541194 : MTR TEST TO RUN EMBEDDED SERVER CLIENT TESTS IN MYSQL_CLIENT_TEST.C.
+--echo #
+
+# Stop the server
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--echo stopped the current server
+
+perl;
+my $cli_string = $ENV{'MYSQL_CLIENT_TEST'};
+my $filestring = 'file';
+$cli_string =~ s/mysql_client_test/mysql_client_test_embedded/;
+if ($cli_string =~ /(.+?)\s/) {
+$filestring = $1;
+}
+my $emb_cli = 0;
+if (-e $filestring){
+  open (ISLINK, ">" . $ENV{'MYSQL_TMP_DIR'} . "/embedded_cli");
+  $emb_cli = 1;
+  print ISLINK "let \$emb_client = $cli_string;\n";
+  print ISLINK "let \$emb_cli_exists = $emb_cli;\n";
+  close ISLINK;
+}
+else {
+  open (ISLINK, ">" . $ENV{'MYSQL_TMP_DIR'} . "/embedded_cli");
+  print ISLINK "let \$emb_client = $cli_string;\n";
+  close ISLINK;
+}
+
+EOF
+
+--source $MYSQL_TMP_DIR/embedded_cli
+--remove_file $MYSQL_TMP_DIR/embedded_cli
+
+if (! $emb_cli_exists){
+  --skip Test only works with embedded server
+}
+
+--exec $emb_client --silent >> $MYSQLTEST_VARDIR/log/mysql_embedded_client_test.out.log 2>&1
+
+--echo # 7. Restart the server and cleanup
+#-----------------------------------------
+--enable_reconnect
+--exec echo "restart" > $restart_file
+--source include/wait_until_connected_again.inc

No bundle (reason: useless for push emails).