From: Date: October 13 2005 1:37pm
Subject: bk commit into 4.1 tree (msvensson:1.2489) BUG#12698
List-Archive: http://lists.mysql.com/internals/31017
X-Bug: 12698
Message-Id: <20051013113715.47D8B25DB70@blaudden.homeip.net>

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2489 05/10/13 13:37:10 msvensson@neptunus.(none) +1 -0
  Bug #12698  abnormal program termination running mysql_client_test
   - The testcase create a .frm file consisting of "junk". Unfortunately the "junk" wasn't
     written to the .frm file if mysql_client_test was run with -s option to make it run silent.
     This most likely caused the file never to be created on windows, and thus the 
      test case failed.

  tests/mysql_client_test.c
    1.159 05/10/13 13:37:04 msvensson@neptunus.(none) +1 -2
    Always write "junk" to the test file.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug12698/my41-bug12698

--- 1.158/tests/mysql_client_test.c	2005-09-09 10:22:12 +02:00
+++ 1.159/tests/mysql_client_test.c	2005-10-13 13:37:04 +02:00
@@ -6962,8 +6962,7 @@
     fprintf(stdout, "\n test cancelled");
     exit(1);
   }
-  if (!opt_silent)
-    fprintf(test_file, "this is a junk file for test");
+  fprintf(test_file, "this is a junk file for test");
 
   rc= mysql_query(mysql, "SHOW TABLE STATUS like 'test_frm_bug'");
   myquery(rc);