bk commit into 5.1 tree (msvensson:1.2355)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2006-12-06 22:28:40+01:00, msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2359.21

  mysql-test/t/disabled.def@stripped, 2006-12-06 22:28:34+01:00, msvensson@neptunus.(none) +0 -2
    Manual merge
    MERGE: 1.2.4.16

  mysys/my_getopt.c@stripped, 2006-12-06 22:12:55+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.55.1.2

  mysys/my_init.c@stripped, 2006-12-06 22:28:34+01:00, msvensson@neptunus.(none) +0 -3
    Manual merge
    MERGE: 1.44.1.3

  sql/sql_class.cc@stripped, 2006-12-06 22:12:55+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.223.1.33

  sql/sql_class.h@stripped, 2006-12-06 22:12:55+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.230.1.83

  sql/sql_parse.cc@stripped, 2006-12-06 22:12:56+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.426.1.169

# 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/mysql-5.1-maint/RESYNC

--- 1.53/mysys/my_init.c	2006-12-06 22:28:54 +01:00
+++ 1.54/mysys/my_init.c	2006-12-06 22:28:54 +01:00
@@ -131,9 +131,18 @@ void my_end(int infoflag)
   */
   FILE *info_file= DBUG_FILE;
   my_bool print_info= (info_file != stderr);
-  /* We do not use DBUG_ENTER here, as after cleanup DBUG is no longer
+
+  /*
+    We do not use DBUG_ENTER here, as after cleanup DBUG is no longer
      operational, so we cannot use DBUG_RETURN.
   */
+
+  if (!my_init_done)
+  {
+    DBUG_PRINT("warning",("my_end called twice or without previous my_init"));
+    return;
+  }
+
   DBUG_PRINT("info",("Shutting down"));
   if (!info_file)
   {

--- 1.58/mysys/my_getopt.c	2006-12-06 22:28:54 +01:00
+++ 1.59/mysys/my_getopt.c	2006-12-06 22:28:54 +01:00
@@ -70,6 +70,7 @@ static void default_reporter(enum loglev
     fprintf(stderr, "%s", "Info: ");
   vfprintf(stderr, format, args);
   va_end(args);
+  fflush(stderr);
 }
 
 /*