[mariadb] use range_id_t for multi_range_read_next(). refs #1152

mroonga · Oct 31, 2011 · 19b2481 · 19b2481
1 parent c2bc6d0
commit 19b2481
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -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;

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -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 @@ class ha_mroonga: public handler
   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 @@ class ha_mroonga: public handler
   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,