Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:42:00 JST 2012
Kouhei Sutou 2012-04-09 18:24:53 +0900 (Mon, 09 Apr 2012) New Revision: f54650fd0a4a7c3838f77cc5070f3f4f4919d2b0 https://github.com/mroonga/mroonga/commit/f54650fd0a4a7c3838f77cc5070f3f4f4919d2b0 Log: Move MRN_DBUG_ENTER_* to mrn_mysql.h Modified files: ha_mroonga.cpp mrn_mysql.h Modified: ha_mroonga.cpp (+0 -14) =================================================================== --- ha_mroonga.cpp 2012-04-09 17:30:55 +0900 (58e3510) +++ ha_mroonga.cpp 2012-04-09 18:24:53 +0900 (b2ded3a) @@ -45,24 +45,10 @@ #include "ha_mroonga.hpp" #include <mrn_path_mapper.hpp> -#define MRN_MESSAGE_BUFFER_SIZE 1024 - #define MRN_SHORT_TEXT_SIZE (1 << 12) // 4Kbytes #define MRN_TEXT_SIZE (1 << 16) // 64Kbytes #define MRN_LONG_TEXT_SIZE (1 << 31) // 2Gbytes -#define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__) -#if !defined(DBUG_OFF) && !defined(_lint) -# define MRN_DBUG_ENTER_METHOD() \ - char method_name[MRN_MESSAGE_BUFFER_SIZE]; \ - method_name[0] = '\0'; \ - strcat(method_name, "ha_mroonga::"); \ - strcat(method_name, __FUNCTION__); \ - DBUG_ENTER(method_name) -#else -# define MRN_DBUG_ENTER_METHOD() MRN_DBUG_ENTER_FUNCTION() -#endif - #if MYSQL_VERSION_ID >= 50500 extern mysql_mutex_t LOCK_open; # define mrn_open_mutex_lock() mysql_mutex_lock(&LOCK_open) Modified: mrn_mysql.h (+13 -0) =================================================================== --- mrn_mysql.h 2012-04-09 17:30:55 +0900 (399e47f) +++ mrn_mysql.h 2012-04-09 18:24:53 +0900 (dd4803c) @@ -57,6 +57,19 @@ # define MRN_MARIADB_P 1 #endif +#define MRN_MESSAGE_BUFFER_SIZE 1024 + #define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__) +#if !defined(DBUG_OFF) && !defined(_lint) +# define MRN_DBUG_ENTER_METHOD() \ + char method_name[MRN_MESSAGE_BUFFER_SIZE]; \ + method_name[0] = '\0'; \ + strcat(method_name, "ha_mroonga::"); \ + strcat(method_name, __FUNCTION__); \ + DBUG_ENTER(method_name) +#else +# define MRN_DBUG_ENTER_METHOD() MRN_DBUG_ENTER_FUNCTION() +#endif + #endif /* _mrn_mysql_h */ -------------- next part -------------- HTML����������������������������...Download