1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

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>
This commit is contained in:
Kristian Nielsen
2016-09-22 12:23:32 +02:00
parent 19abe79fd1
commit a9fb480fd6
10 changed files with 41 additions and 32 deletions

View File

@@ -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 */