mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch to release clone. Fixes two post-pushbuild discovered failures.

Browse source 
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.
This commit is contained in:
unknown 2007-03-02 09:14:33 -05:00
parent 4cb4899fa2
commit 37dd1c9de4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_profile.cc
View file

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

12
sql/sql_profile.h
View file

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