diff options
author | cmiller@zippy.cornsilk.net <> | 2007-03-02 09:14:33 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2007-03-02 09:14:33 -0500 |
commit | 94036e0137578d7e708bbc1b6b011d5bb9983a34 (patch) | |
tree | 18873e127f26383554de48db83220244054ce311 /sql/sql_profile.cc | |
parent | fac19ef0e26f120025e3fda1b0cf6da4ba7e0457 (diff) | |
download | mariadb-git-94036e0137578d7e708bbc1b6b011d5bb9983a34.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.
Diffstat (limited to 'sql/sql_profile.cc')
-rw-r--r-- | sql/sql_profile.cc | 4 |
1 files changed, 2 insertions, 2 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. |