diff options
author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /tests | |
parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz |
Merge MariaDB 10.0-base to MariaDB 10.0
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 10db62781ee..b45a4ade400 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18554,6 +18554,22 @@ static void test_progress_reporting() mysql_close(conn); } +/** + MDEV-3885 - connection suicide via mysql_kill() causes assertion in server +*/ + +static void test_mdev3885() +{ + int rc; + MYSQL *conn; + + myheader("test_mdev3885"); + conn= client_connect(0, MYSQL_PROTOCOL_TCP, 0); + rc= mysql_kill(conn, mysql_thread_id(conn)); + DIE_UNLESS(rc); + mysql_close(conn); +} + /** Bug#57058 SERVER_QUERY_WAS_SLOW not wired up. @@ -19056,6 +19072,7 @@ static struct my_tests_st my_tests[]= { { "test_bug58036", test_bug58036 }, { "test_bug57058", test_bug57058 }, { "test_bug56976", test_bug56976 }, + { "test_mdev3855", test_mdev3885 }, { "test_bug11766854", test_bug11766854 }, { "test_bug12337762", test_bug12337762 }, { "test_progress_reporting", test_progress_reporting }, |