mariadb10.3: follow TABLE_LIST::table_name API change

mroonga · Apr 27, 2018 · 66bb82e · 66bb82e
1 parent 13d9253
commit 66bb82e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -3283,10 +3283,12 @@ int ha_mroonga::create_share_for_create() const
   mrn_init_alloc_root(&mem_root_for_create, "mroonga::create", 1024, 0, MYF(0));
   analyzed_for_create = true;
   if (table_list) {
-    share_for_create.table_name = mrn_my_strndup(table_list->table_name,
-                                                 table_list->table_name_length,
-                                                 MYF(MY_WME));
-    share_for_create.table_name_length = table_list->table_name_length;
+    share_for_create.table_name =
+      mrn_my_strndup(MRN_TABLE_LIST_TABLE_NAME_DATA(table_list),
+                     MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list),
+                     MYF(MY_WME));
+    share_for_create.table_name_length =
+      MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list);
   }
   share_for_create.table_share = &table_share_for_create;
   table_for_create.s = &table_share_for_create;

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -624,3 +624,15 @@ typedef uint mrn_alter_table_flags;
   Alter_inplace_info::ALTER_ ## name
 #  define MRN_ALTER_INFO_FLAG(name) Alter_info::ALTER_ ## name
 #endif
+
+#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100306
+#  define MRN_TABLE_LIST_TABLE_NAME_DATA(table_list)    \
+  (table_list)->table_name.str
+#  define MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list)  \
+  (table_list)->table_name.length
+#else
+#  define MRN_TABLE_LIST_TABLE_NAME_DATA(table_list)    \
+  (table_list)->table_name
+#  define MRN_TABLE_LIST_TABLE_NAME_LENGTH(table_list)  \
+  (table_list)->table_name_length
+#endif