Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:27:36 JST 2012
Kouhei Sutou 2011-08-12 12:17:11 +0900 (Fri, 12 Aug 2011) New Revision: 9714f9900f5e341f1e89654a383a96aa89de7eae https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae Log: [mysql-5.6] use get_table_def_key() in MySQL 5.6.3. fixes #1046 Modified files: mrn_table.cc Modified: mrn_table.cc (+6 -1) =================================================================== --- mrn_table.cc 2011-08-12 12:07:42 +0900 (617a939) +++ mrn_table.cc 2011-08-12 12:17:11 +0900 (1283c0d) @@ -577,7 +577,6 @@ 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 @@ -585,7 +584,13 @@ TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error) #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, -------------- next part -------------- HTML����������������������������...Download