database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init

Browse Source 
Fix test failure when using maria small-block size. We need to query
the max_key_length and max_key_parts based on the the tmp table engine.
This commit is contained in:
Vicențiu Ciorbaru
2016-02-10 03:49:11 +02:00
parent 6b614c620e
commit 3c5c04bd2b
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_select.h
View File

@ -40,8 +40,21 @@
#endif
#if defined(USE_ARIA_FOR_TMP_TABLES)
#define TMP_ENGINE_HTON maria_hton
inline uint tmp_table_max_key_length() {
return maria_max_key_length();
}
inline uint tmp_table_max_key_parts() {
return maria_max_key_segments();
}
#else
#define TMP_ENGINE_HTON myisam_hton
inline uint tmp_table_max_key_length() {
return MI_MAX_KEY_LENGTH;
}
inline uint tmp_table_max_key_parts() {
return MI_MAX_KEY_SEG;
}
#endif
/* Values in optimize */
#define KEY_OPTIMIZE_EXISTS 1