bk commit into 4.1 tree (msvensson:1.2413) BUG#7037

[msvensson]

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.2413 05/09/23 14:07:31 msvensson@neptunus.(none) +1 -0
  Bug #7037  	Test "mysql_protocols" fails on Solaris 8 + 9 /x86

  mysys/my_init.c
    1.41 05/09/23 14:07:28 msvensson@neptunus.(none) +7 -2
    Updated after review

# 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/fix_mysqltest/my41-fix_mysqltest

--- 1.40/mysys/my_init.c	2005-09-23 09:47:37 +02:00
+++ 1.41/mysys/my_init.c	2005-09-23 14:07:28 +02:00
@@ -127,9 +127,14 @@
 
 void my_end(int infoflag)
 {
-  DBUG_ENTER("my_end");
+  /*
+    this code is suboptimal to workaround a bug in
+    Sun CC: Sun C++ 5.6 2004/06/02 for x86, and should not be
+    optimized until this compiler is not in use anymore
+  */
   FILE *info_file= DBUG_FILE;
-  bool print_info= (info_file != stderr);
+  my_bool print_info= (info_file != stderr);
+  DBUG_ENTER("my_end");
   if (!info_file)
   {
     info_file= stderr;