mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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.
This commit is contained in:
@@ -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[];
|
||||
|
Reference in New Issue
Block a user