1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
This commit is contained in:
cmiller@zippy.cornsilk.net 2007-03-02 09:53:43 -05:00
commit 06af7b4b8c
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 "mysql_priv.h"
#include "my_sys.h" #include "my_sys.h"
#define TIME_FLOAT_DIGITS 7 #define TIME_FLOAT_DIGITS 9
#define MAX_QUERY_LENGTH 300 #define MAX_QUERY_LENGTH 300
bool schema_table_store_record(THD *thd, TABLE *table); bool schema_table_store_record(THD *thd, TABLE *table);
/* Reserved for systems that can't record the function name in source. */ /* 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. Connects Information_Schema and Profiling.

12
sql/sql_profile.h
View File

@ -20,21 +20,21 @@
# if __GNUC__ >= 2 # if __GNUC__ >= 2
# define __func__ __FUNCTION__ # define __func__ __FUNCTION__
# else # else
# define __func__ _db_func_ # define __func__ _unknown_func_
extern const char *_db_func_; extern const char * const _unknown_func_;
# endif # endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# if _MSC_VER < 1300 # if _MSC_VER < 1300
# define __func__ _db_func_ # define __func__ _unknown_func_
extern const char *_db_func_; extern const char * const _unknown_func_;
# else # else
# define __func__ __FUNCTION__ # define __func__ __FUNCTION__
# endif # endif
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
# define __func__ __FUNC__ # define __func__ __FUNC__
#else #else
# define __func__ _db_func_ # define __func__ _unknown_func_
extern const char *_db_func_; extern const char * const _unknown_func_;
#endif #endif
extern ST_FIELD_INFO query_profile_statistics_info[]; extern ST_FIELD_INFO query_profile_statistics_info[];