summaryrefslogtreecommitdiff
path: root/sql/sql_test.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2015-02-19 20:54:20 +0300
committerSergei Petrunia <psergey@askmonty.org>2015-02-19 20:54:20 +0300
commit0f8b194146b50afe442682c5a14a8a179e28f3b8 (patch)
tree4e3df989276bf0a72231d4703f3c7b6641b64a45 /sql/sql_test.cc
parentf37bdd9c1a29865574b10fe7d21164ee7cae4d19 (diff)
downloadmariadb-git-0f8b194146b50afe442682c5a14a8a179e28f3b8.tar.gz
MDEV-6687: Assertion `0' failed in Protocol::end_statement on query
Redefine FT_KEYPART in a way that it does not conflict with Hash Join. Hash join stores field->field_index in KEYUSE::keypart, so we must use a value of FT_KEYPART that's greater than MAX_FIELDS.
Diffstat (limited to 'sql/sql_test.cc')
-rw-r--r--sql/sql_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 8992ff24a1e..82abc861ec4 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -220,7 +220,7 @@ TEST_join(JOIN *join)
}
-#define FT_KEYPART (MAX_REF_PARTS+10)
+#define FT_KEYPART (MAX_FIELDS+10)
void print_keyuse(KEYUSE *keyuse)
{