bk commit into 5.0 tree (cmiller:1.2417)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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, 2007-03-02 09:14:33-05:00, cmiller@stripped +2 -0
  Patch to release clone.  Fixes two post-pushbuild discovered failures.
  
  Expand float size to avoid assert()ion failures.
  
  "_db_func_" isn't a known linked object on some platforms, possibly 
  because it is occasionaly shadowed by DBUG variables.  Avoid that
  confusion.

  sql/sql_profile.cc@stripped, 2007-03-02 09:14:31-05:00, cmiller@stripped +2 -2
    Expand float size to avoid assert()ion failures.
    
    "_db_func_" isn't a known linked object on some platforms, possibly 
    because it is occasionaly shadowed by DBUG variables.  Avoid that
    confusion.

  sql/sql_profile.h@stripped, 2007-03-02 09:14:31-05:00, cmiller@stripped +6 -6
    "_db_func_" isn't a known linked object on some platforms, possibly 
    because it is occasionaly shadowed by DBUG variables.  Avoid that
    confusion.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-community

--- 1.3/sql/sql_profile.cc	2007-03-02 09:14:36 -05:00
+++ 1.4/sql/sql_profile.cc	2007-03-02 09:14:36 -05:00
@@ -17,13 +17,13 @@
 #include "mysql_priv.h"
 #include "my_sys.h"
 
-#define TIME_FLOAT_DIGITS 7
+#define TIME_FLOAT_DIGITS 9
 #define MAX_QUERY_LENGTH 300
 
 bool schema_table_store_record(THD *thd, TABLE *table);
 
 /* Reserved for systems that can't record the function name in source. */
-const char *_db_func_= "<unknown>";
+const char * const _unknown_func_ = "<unknown>";
 
 /**
   Connects Information_Schema and Profiling.

--- 1.2/sql/sql_profile.h	2007-03-02 09:14:37 -05:00
+++ 1.3/sql/sql_profile.h	2007-03-02 09:14:37 -05:00
@@ -20,21 +20,21 @@
 #  if __GNUC__ >= 2
 #    define __func__ __FUNCTION__
 #  else
-#    define __func__ _db_func_
-extern const char *_db_func_;
+#    define __func__ _unknown_func_
+extern const char * const _unknown_func_;
 #  endif
 #elif defined(_MSC_VER)
 #  if _MSC_VER < 1300
-#     define __func__ _db_func_
-extern const char *_db_func_;
+#     define __func__ _unknown_func_
+extern const char * const _unknown_func_;
 #  else
 #    define __func__ __FUNCTION__
 #  endif
 #elif defined(__BORLANDC__)
 #  define __func__ __FUNC__
 #else
-#  define __func__ _db_func_
-extern const char *_db_func_;
+#  define __func__ _unknown_func_
+extern const char * const _unknown_func_;
 #endif
 
 extern ST_FIELD_INFO query_profile_statistics_info[];