summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-09-22 12:23:32 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-10-14 23:15:58 +0200
commita9fb480fd614031e2e372b1fb8d7e4c858954ac6 (patch)
treecd7f7023f9d7cf3c6f56003995a2f0c8188d7657 /tests
parent19abe79fd15ab6d8ac0c2f65476bc3c7d29a008d (diff)
downloadmariadb-git-a9fb480fd614031e2e372b1fb8d7e4c858954ac6.tar.gz
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 <knielsen@knielsen-hq.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c2
1 files changed, 1 insertions, 1 deletions
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 */