diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
| commit | a5679af1b13bb0c7c4eaa75f27551072dc18fb7d (patch) | |
| tree | 7d039fb5e83c331daa75f9b9b67625b0469f6a9b /sql/sql_class.h | |
| parent | 20c4dfd4a9e7c5f2f570488a7ead0b7c74e61817 (diff) | |
| parent | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff) | |
| download | mariadb-git-a5679af1b13bb0c7c4eaa75f27551072dc18fb7d.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6468f301082..c52386715fe 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2009, 2015, MariaDB + Copyright (c) 2009, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4460,10 +4460,14 @@ public: #define TMP_ENGINE_COLUMNDEF MARIA_COLUMNDEF #define TMP_ENGINE_HTON maria_hton #define TMP_ENGINE_NAME "Aria" +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_COLUMNDEF MI_COLUMNDEF #define TMP_ENGINE_HTON myisam_hton #define TMP_ENGINE_NAME "MyISAM" +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 /* |