From a9fb480fd614031e2e372b1fb8d7e4c858954ac6 Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Thu, 22 Sep 2016 12:23:32 +0200 Subject: MDEV-7145: Delayed replication, fixing test failures. Two merge error fixed, and testsuite updated to removed some other test failues. Signed-off-by: Kristian Nielsen --- tests/mysql_client_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index b95127f954f..74c6d684295 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -447,7 +447,7 @@ static void test_prepare_simple() strmov(query, "SHOW SLAVE STATUS"); stmt= mysql_simple_prepare(mysql, query); check_stmt(stmt); - DIE_UNLESS(mysql_stmt_field_count(stmt) == 47); + DIE_UNLESS(mysql_stmt_field_count(stmt) == 50); mysql_stmt_close(stmt); /* show master status */ -- cgit v1.2.1