summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2016-10-19 03:02:13 +0300
committerElena Stepanova <elenst@montyprogram.com>2016-10-19 03:02:13 +0300
commit25848978334f9682f0b4712bf9d7c8222bab606f (patch)
tree1311d2a7c6cccaa27b0f0ee00264eabd3d48da49 /tests
parentfd1f5072839467d2d0216b85c2cd576284bc4955 (diff)
downloadmariadb-git-25848978334f9682f0b4712bf9d7c8222bab606f.tar.gz
MDEV-11082 mysql_client_test: test_ps_query_cache fails with group-concat-max-len=1M
test_bug14169 was setting session group_concat_max_len=1024 and did not clean it up. Because of that test_ps_query_cache, when run with group-concat-max-len != 1024, had different values in connections, and was inserting into query cache when a hit was expected. Fixed by adding a clean-up for the value in test_bug14169
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index b95127f954f..ad8933118cc 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15375,6 +15375,9 @@ static void test_bug14169()
rc= mysql_query(mysql, "drop table t1");
myquery(rc);
+
+ rc= mysql_query(mysql, "set session group_concat_max_len=@@global.group_concat_max_len");
+ myquery(rc);
}
/*