mariadb10.3: follow TABLE_LIST::db type change

mroonga · Apr 25, 2018 · 09d6a87 · 09d6a87
1 parent 2e73dd1
commit 09d6a87
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/mrn_table.cpp b/mrn_table.cpp
@@ -1077,8 +1077,15 @@ TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list, const char *path
   char key[MAX_DBKEY_LENGTH];
   key_length = create_table_def_key(thd, key, table_list, FALSE);
 #endif
-#if MYSQL_VERSION_ID >= 100002 && defined(MRN_MARIADB_P)
-  share = alloc_table_share(table_list->db, table_list->table_name, key,
+#if MYSQL_VERSION_ID >= 100306 && defined(MRN_MARIADB_P)
+  share = alloc_table_share(table_list->db.str,
+                            table_list->table_name,
+                            key,
+                            key_length);
+#elif MYSQL_VERSION_ID >= 100002 && 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);