diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-11-01 17:33:55 +0100 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-11-01 17:33:55 +0100 |
commit | 0b034dd21fd20935eb15f93c3a4f0c94f1b7116b (patch) | |
tree | 23bdaa83c6796362ff9b620e61f306fe3f644c2d /tests | |
parent | 48cbd14165a2d3d4d5c33fd7a4c9ad198dee5dd3 (diff) | |
parent | e5d2a53b783d9a0b5240b21d21883b66f036009b (diff) | |
download | mariadb-git-0b034dd21fd20935eb15f93c3a4f0c94f1b7116b.tar.gz |
merge 5.1 => 5.5
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 97ea018b280..4c0904ab166 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -15887,6 +15887,7 @@ static void test_bug27876() rc= mysql_query(mysql, "set names default"); myquery(rc); + DBUG_VOID_RETURN; } |