diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-03-02 09:14:33 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-03-02 09:14:33 -0500 |
| commit | 37dd1c9de4f7d9c7fbcb95458f72ccdef0a79aa2 (patch) | |
| tree | 18873e127f26383554de48db83220244054ce311 /sql | |
| parent | 4cb4899fa203a2c483188251e70e67d3ef00f682 (diff) | |
| download | mariadb-git-37dd1c9de4f7d9c7fbcb95458f72ccdef0a79aa2.tar.gz | |
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:
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:
"_db_func_" isn't a known linked object on some platforms, possibly
because it is occasionaly shadowed by DBUG variables. Avoid that
confusion.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_profile.cc | 4 | ||||
| -rw-r--r-- | sql/sql_profile.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 1d38b313bd3..028363f167e 100644 --- a/sql/sql_profile.cc +++ b/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. diff --git a/sql/sql_profile.h b/sql/sql_profile.h index 944856a9f80..0b387f2a7cb 100644 --- a/sql/sql_profile.h +++ b/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[]; |