[Groonga-mysql-commit] mroonga/mroonga at 09d6a87 [master] mariadb10.3: follow TABLE_LIST::db type change

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Apr 25 17:12:15 JST 2018


Kouhei Sutou	2018-04-25 17:12:15 +0900 (Wed, 25 Apr 2018)

  New Revision: 09d6a87d6d13ed3bead850d820e0343c66bdc8dc
  https://github.com/mroonga/mroonga/commit/09d6a87d6d13ed3bead850d820e0343c66bdc8dc

  Message:
    mariadb10.3: follow TABLE_LIST::db type change

  Modified files:
    mrn_table.cpp

  Modified: mrn_table.cpp (+9 -2)
===================================================================
--- mrn_table.cpp    2018-04-25 17:11:10 +0900 (dcfa92a4)
+++ mrn_table.cpp    2018-04-25 17:12:15 +0900 (ac20fff5)
@@ -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);
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180425/317229a7/attachment-0001.htm 



More information about the Groonga-mysql-commit mailing list
Back to archive index