mysql 8.0.13: follow alloc_table_share() signature change

mroonga · Nov 26, 2018 · 8dacdda · 8dacdda
1 parent 654ce71
commit 8dacdda
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -738,3 +738,28 @@ typedef HASH mrn_table_def_cache_type;
 #else
 #  define mrn_destroy(pointer) delete pointer
 #endif
+
+#if MYSQL_VERSION_ID >= 80013 && !defined(MRN_MARIADB_P)
+#  define mrn_alloc_table_share(table_list, key, key_length) \
+  alloc_table_share((table_list)->db,                        \
+                    (table_list)->table_name,                \
+                    (key),                                   \
+                    (key_length),                            \
+                    false)
+#elif MYSQL_VERSION_ID >= 100306 && defined(MRN_MARIADB_P)
+#  define mrn_alloc_table_share(table_list, key, key_length) \
+  alloc_table_share((table_list)->db.str,                    \
+                    (table_list)->table_name.str,            \
+                    (key),                                   \
+                    (key_length))
+#elif (MYSQL_VERSION_ID >= 100002 && defined(MRN_MARIADB_P)) || \
+  (MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P))
+#  define mrn_alloc_table_share(table_list, key, key_length)    \
+  alloc_table_share((table_list)->db,                           \
+                    (table_list)->table_name,                   \
+                    (key),                                      \
+                    (key_length))
+#else
+#  define mrn_alloc_table_share(table_list, key, key_length)    \
+  alloc_table_share((table_list), (key), (key_length))
+#endif
diff --git a/mrn_table.cpp b/mrn_table.cpp
@@ -1004,20 +1004,7 @@ TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list,
   char key[MAX_DBKEY_LENGTH];
   key_length = create_table_def_key(thd, key, table_list, false);
 #endif
-#if MYSQL_VERSION_ID >= 100306 && defined(MRN_MARIADB_P)
-  share = alloc_table_share(table_list->db.str,
-                            table_list->table_name.str,
-                            key,
-                            key_length);
-#elif (MYSQL_VERSION_ID >= 100002 && defined(MRN_MARIADB_P)) || \
-  (MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P))
-  share = alloc_table_share(table_list->db,
-                            table_list->table_name,
-                            key,
-                            key_length);
-#else
-  share = alloc_table_share(table_list, key, key_length);
-#endif
+  share = mrn_alloc_table_share(table_list, key, key_length);
   if (!share)
   {
     *error = ER_CANT_OPEN_FILE;