Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:32:47 JST 2012
Kouhei Sutou 2011-11-27 22:17:14 +0900 (Sun, 27 Nov 2011) New Revision: 0bf7a2e098dd301b2ce775d6fec72470aee39ae5 https://github.com/mroonga/mroonga/commit/0bf7a2e098dd301b2ce775d6fec72470aee39ae5 Merged bec80bd: Merge branch 'master' of github.com:mroonga/mroonga Log: use ifdef for format string for ha_rows. Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+1 -1) =================================================================== --- ha_mroonga.cc 2011-11-27 22:15:08 +0900 (828b8ae) +++ ha_mroonga.cc 2011-11-27 22:17:14 +0900 (f620bcd) @@ -4402,7 +4402,7 @@ ha_rows ha_mroonga::records_in_range(uint key_nr, key_range *range_min, key_rang } else { row_count = storage_records_in_range(key_nr, range_min, range_max); } - DBUG_PRINT("info", ("mroonga: row_count=%llu", row_count)); + DBUG_PRINT("info", ("mroonga: row_count=%" MRN_HA_ROWS_FORMAT, row_count)); DBUG_RETURN(row_count); } Modified: ha_mroonga.h (+6 -0) =================================================================== --- ha_mroonga.h 2011-11-27 22:15:08 +0900 (3b4f4f8) +++ ha_mroonga.h 2011-11-27 22:17:14 +0900 (dbdb7a7) @@ -79,6 +79,12 @@ extern "C" { # define MRN_TABLE_LIST_INIT_REQUIRE_ALIAS #endif +#if MYSQL_VERSION_ID >= 50600 +# define MRN_HA_ROWS_FORMAT "llu" +#else +# define MRN_HA_ROWS_FORMAT "lu" +#endif + class ha_mroonga; /* structs */ -------------- next part -------------- HTML����������������������������...Download