null+****@clear*****
null+****@clear*****
2011年 8月 12日 (金) 10:04:14 JST
Kouhei Sutou 2011-08-12 01:04:14 +0000 (Fri, 12 Aug 2011)
New Revision: 777d34a09e6a1f82c226e1f57edc4c8fbb0eeb56
Log:
[mysql-5.6] use Item instead of COND. refs #1046
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+6 -6)
===================================================================
--- ha_mroonga.cc 2011-08-02 08:05:01 +0000 (efc0670)
+++ ha_mroonga.cc 2011-08-12 01:04:14 +0000 (ded8179)
@@ -300,7 +300,7 @@ static int i_s_groonga_stats_deinit(void* p)
}
static int i_s_groonga_stats_fill(
- THD* thd, TABLE_LIST* tables, COND* cond)
+ THD* thd, TABLE_LIST* tables, Item* cond)
{
TABLE* table = (TABLE *) tables->table;
int status = 0;
@@ -4518,9 +4518,9 @@ int ha_mroonga::ft_read(uchar *buf)
DBUG_RETURN(error);
}
-const COND *ha_mroonga::wrapper_cond_push(const COND *cond)
+const Item *ha_mroonga::wrapper_cond_push(const Item *cond)
{
- const COND *ret_cond;
+ const Item *ret_cond;
MRN_DBUG_ENTER_METHOD();
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
@@ -4530,16 +4530,16 @@ const COND *ha_mroonga::wrapper_cond_push(const COND *cond)
DBUG_RETURN(ret_cond);
}
-const COND *ha_mroonga::storage_cond_push(const COND *cond)
+const Item *ha_mroonga::storage_cond_push(const Item *cond)
{
MRN_DBUG_ENTER_METHOD();
DBUG_RETURN(NULL);
}
-const COND *ha_mroonga::cond_push(const COND *cond)
+const Item *ha_mroonga::cond_push(const Item *cond)
{
MRN_DBUG_ENTER_METHOD();
- const COND *pushed_cond;
+ const Item *pushed_cond;
if (share->wrapper_mode)
{
pushed_cond = wrapper_cond_push(cond);
Modified: ha_mroonga.h (+7 -3)
===================================================================
--- ha_mroonga.h 2011-08-02 08:05:01 +0000 (58993a0)
+++ ha_mroonga.h 2011-08-12 01:04:14 +0000 (f9cea20)
@@ -36,6 +36,10 @@ extern "C" {
# define MRN_HANDLER_CLONE_NEED_NAME 1
#endif
+#if MYSQL_VERSION_ID < 50600
+ typedef Item COND;
+#endif
+
class ha_mroonga;
/* structs */
@@ -182,7 +186,7 @@ public:
FT_INFO *ft_init_ext(uint flags, uint inx, String *key);
int ft_read(uchar *buf);
- const COND *cond_push(const COND *cond);
+ const Item *cond_push(const Item *cond);
void cond_pop();
bool get_error_message(int error, String *buf);
@@ -353,8 +357,8 @@ private:
FT_INFO *storage_ft_init_ext(uint flags, uint key_nr, String *key);
int wrapper_ft_read(uchar *buf);
int storage_ft_read(uchar *buf);
- const COND *wrapper_cond_push(const COND *cond);
- const COND *storage_cond_push(const COND *cond);
+ const Item *wrapper_cond_push(const Item *cond);
+ const Item *storage_cond_push(const Item *cond);
void wrapper_cond_pop();
void storage_cond_pop();
bool wrapper_get_error_message(int error, String *buf);