[mysql-5.6] use get_table_def_key() in MySQL 5.6.3. fixes #1046

mroonga · Aug 12, 2011 · 9714f99 · 9714f99
1 parent 5d0d18f
commit 9714f99
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mrn_table.cc b/mrn_table.cc
@@ -577,15 +577,20 @@ int mrn_free_share(MRN_SHARE *share)
 
 TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error)
 {
-  char key[MAX_DBKEY_LENGTH];
   uint key_length;
   TABLE_SHARE *share;
 #if MYSQL_VERSION_ID >= 50500
   my_hash_value_type hash_value;
 #endif
   THD *thd = current_thd;
   DBUG_ENTER("mrn_get_table_share");
+#if MYSQL_VERSION_ID >= 50603
+  const char *key;
+  key_length = get_table_def_key(table_list, &key);
+#else
+  char key[MAX_DBKEY_LENGTH];
   key_length = create_table_def_key(thd, key, table_list, FALSE);
+#endif
 #if MYSQL_VERSION_ID >= 50500
   hash_value = my_calc_hash(&table_def_cache, (uchar*) key, key_length);
   share = get_table_share(thd, table_list, key, key_length, 0, error,