null+****@clear*****
null+****@clear*****
2011年 10月 31日 (月) 23:27:11 JST
Kouhei Sutou 2011-10-31 14:27:11 +0000 (Mon, 31 Oct 2011)
New Revision: 19b2481cfd13fab3801508aadecd681ede06978a
Log:
[mariadb] use range_id_t for multi_range_read_next(). refs #1152
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+3 -3)
===================================================================
--- ha_mroonga.cc 2011-10-31 14:13:36 +0000 (e99d094)
+++ ha_mroonga.cc 2011-10-31 14:27:11 +0000 (4312c0a)
@@ -6319,7 +6319,7 @@ int ha_mroonga::multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
DBUG_RETURN(error);
}
-int ha_mroonga::wrapper_multi_range_read_next(char **range_info)
+int ha_mroonga::wrapper_multi_range_read_next(range_id_t *range_info)
{
MRN_DBUG_ENTER_METHOD();
int error = 0;
@@ -6333,14 +6333,14 @@ int ha_mroonga::wrapper_multi_range_read_next(char **range_info)
DBUG_RETURN(error);
}
-int ha_mroonga::storage_multi_range_read_next(char **range_info)
+int ha_mroonga::storage_multi_range_read_next(range_id_t *range_info)
{
MRN_DBUG_ENTER_METHOD();
int error = handler::multi_range_read_next(range_info);
DBUG_RETURN(error);
}
-int ha_mroonga::multi_range_read_next(char **range_info)
+int ha_mroonga::multi_range_read_next(range_id_t *range_info)
{
MRN_DBUG_ENTER_METHOD();
int error = 0;
Modified: ha_mroonga.h (+7 -3)
===================================================================
--- ha_mroonga.h 2011-10-31 14:13:36 +0000 (d399198)
+++ ha_mroonga.h 2011-10-31 14:27:11 +0000 (41254e9)
@@ -75,6 +75,10 @@ extern "C" {
typedef MYSQL_ERROR Sql_condition;
#endif
+#if !defined(MRN_MARIADB_P)
+ typedef char *range_id_t;
+#endif
+
class ha_mroonga;
/* structs */
@@ -268,7 +272,7 @@ public:
int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
uint n_ranges, uint mode,
HANDLER_BUFFER *buf);
- int multi_range_read_next(char **range_info);
+ int multi_range_read_next(range_id_t *range_info);
#else // MRN_HANDLER_HAVE_MULTI_RANGE_READ
int read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
KEY_MULTI_RANGE *ranges,
@@ -552,8 +556,8 @@ private:
int storage_multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
uint n_ranges, uint mode,
HANDLER_BUFFER *buf);
- int wrapper_multi_range_read_next(char **range_info);
- int storage_multi_range_read_next(char **range_info);
+ int wrapper_multi_range_read_next(range_id_t *range_info);
+ int storage_multi_range_read_next(range_id_t *range_info);
#else // MRN_HANDLER_HAVE_MULTI_RANGE_READ
int wrapper_read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
KEY_MULTI_RANGE *ranges,