null+****@clear*****
null+****@clear*****
2011年 12月 21日 (水) 12:49:50 JST
Kouhei Sutou 2011-12-21 03:49:50 +0000 (Wed, 21 Dec 2011)
New Revision: 630c6bad42113f6dc8aabb1d38078d408ad7c6c9
Log:
[mysql5.6.4] COST_VECT -> Cost_estimate.
Modified files:
ha_mroonga.cc
ha_mroonga.h
mrn_mysql_compat.h
Modified: ha_mroonga.cc (+9 -6)
===================================================================
--- ha_mroonga.cc 2011-12-19 18:09:04 +0000 (cfd41f6)
+++ ha_mroonga.cc 2011-12-21 03:49:50 +0000 (0c0e129)
@@ -6631,7 +6631,7 @@ ha_rows ha_mroonga::wrapper_multi_range_read_info_const(uint keyno,
uint n_ranges,
uint *bufsz,
uint *flags,
- COST_VECT *cost)
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows;
@@ -6659,7 +6659,7 @@ ha_rows ha_mroonga::storage_multi_range_read_info_const(uint keyno,
uint n_ranges,
uint *bufsz,
uint *flags,
- COST_VECT *cost)
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows = handler::multi_range_read_info_const(keyno, seq,
@@ -6672,7 +6672,8 @@ ha_rows ha_mroonga::storage_multi_range_read_info_const(uint keyno,
ha_rows ha_mroonga::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
void *seq_init_param,
uint n_ranges, uint *bufsz,
- uint *flags, COST_VECT *cost)
+ uint *flags,
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows;
@@ -6695,7 +6696,8 @@ ha_rows ha_mroonga::wrapper_multi_range_read_info(uint keyno, uint n_ranges,
uint key_parts,
#endif
uint *bufsz,
- uint *flags, COST_VECT *cost)
+ uint *flags,
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows;
@@ -6728,7 +6730,8 @@ ha_rows ha_mroonga::storage_multi_range_read_info(uint keyno, uint n_ranges,
uint key_parts,
#endif
uint *bufsz,
- uint *flags, COST_VECT *cost)
+ uint *flags,
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows = handler::multi_range_read_info(keyno, n_ranges, keys,
@@ -6744,7 +6747,7 @@ ha_rows ha_mroonga::multi_range_read_info(uint keyno, uint n_ranges, uint keys,
uint key_parts,
#endif
uint *bufsz, uint *flags,
- COST_VECT *cost)
+ Cost_estimate *cost)
{
MRN_DBUG_ENTER_METHOD();
ha_rows rows;
Modified: ha_mroonga.h (+7 -7)
===================================================================
--- ha_mroonga.h 2011-12-19 18:09:04 +0000 (5f97c77)
+++ ha_mroonga.h 2011-12-21 03:49:50 +0000 (35aa823)
@@ -57,7 +57,7 @@ extern "C" {
# define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1
#endif
-#if (MYSQL_VERSION_ID >= 50603) || \
+#if (MYSQL_VERSION_ID >= 50604) || \
(defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
# define MRN_HANDLER_HAVE_HA_CLOSE 1
# define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
@@ -270,12 +270,12 @@ public:
ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
void *seq_init_param,
uint n_ranges, uint *bufsz,
- uint *flags, COST_VECT *cost);
+ uint *flags, Cost_estimate *cost);
ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys,
#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
uint key_parts,
#endif
- uint *bufsz, uint *flags, COST_VECT *cost);
+ uint *bufsz, uint *flags, Cost_estimate *cost);
int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
uint n_ranges, uint mode,
HANDLER_BUFFER *buf);
@@ -553,26 +553,26 @@ private:
uint n_ranges,
uint *bufsz,
uint *flags,
- COST_VECT *cost);
+ Cost_estimate *cost);
ha_rows storage_multi_range_read_info_const(uint keyno,
RANGE_SEQ_IF *seq,
void *seq_init_param,
uint n_ranges,
uint *bufsz,
uint *flags,
- COST_VECT *cost);
+ Cost_estimate *cost);
ha_rows wrapper_multi_range_read_info(uint keyno, uint n_ranges, uint keys,
#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
uint key_parts,
#endif
uint *bufsz, uint *flags,
- COST_VECT *cost);
+ Cost_estimate *cost);
ha_rows storage_multi_range_read_info(uint keyno, uint n_ranges, uint keys,
#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
uint key_parts,
#endif
uint *bufsz, uint *flags,
- COST_VECT *cost);
+ Cost_estimate *cost);
int wrapper_multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
uint n_ranges, uint mode,
HANDLER_BUFFER *buf);
Modified: mrn_mysql_compat.h (+5 -1)
===================================================================
--- mrn_mysql_compat.h 2011-12-19 18:09:04 +0000 (d652109)
+++ mrn_mysql_compat.h 2011-12-21 03:49:50 +0000 (2be54ff)
@@ -44,10 +44,14 @@
typedef Item COND;
#endif
-#if MYSQL_VERSION_ID < 50603 || defined(MRN_MYSQL_INNODB_FTS_P)
+#if MYSQL_VERSION_ID < 50603
typedef MYSQL_ERROR Sql_condition;
#endif
+#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
+ typedef Cost_estimate COND_VECT;
+#endif
+
#if MYSQL_VERSION_ID >= 50516 && MYSQL_VERSION_ID < 50603
# define MRN_PLUGIN_HAVE_FLAGS 1
#endif