Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702281606-5.0.37/mysql-5.0-release

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community

sql/sql_profile.cc

@@ -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.

sql/sql_profile.h

@@ -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[];