mysql56: use Item::item_name instead of Item::name

mroonga · Nov 19, 2012 · 1f4ff94 · 1f4ff94
1 parent e51f4d5
commit 1f4ff94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -7118,7 +7118,13 @@ void ha_mroonga::generic_ft_init_ext_add_conditions_fast_order_limit(
             Item *right_item = arguments[1];
             if (left_item->type() == Item::FIELD_ITEM) {
               GRN_BULK_REWIND(&column_name);
+#ifdef MRN_ITEM_HAVE_ITEM_NAME
+              Item_name_string *name = &(left_item->item_name);
+              GRN_TEXT_PUT(info->ctx, &column_name,
+                           name->ptr(), name->length());
+#else
               GRN_TEXT_PUTS(info->ctx, &column_name, left_item->name);
+#endif
               grn_expr_append_const(info->ctx, expression, &column_name,
                                     GRN_OP_PUSH, 1);
               grn_expr_append_op(info->ctx, expression, GRN_OP_GET_VALUE, 1);

diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -140,6 +140,10 @@ extern "C" {
 #  define MRN_JOIN_TAB_HAVE_CONDITION
 #endif
 
+#if MYSQL_VERSION_ID >= 50607
+#  define MRN_ITEM_HAVE_ITEM_NAME
+#endif
+
 #if MYSQL_VERSION_ID < 50600
 #  define MRN_RBR_UPDATE_NEED_ALL_COLUMNS
 #endif