summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-10-16 23:44:44 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-10-16 23:44:44 +0200
commite1ef99c3dcb8bb6fdea290e319d14f5a983d1785 (patch)
tree6118948d076e16868b46bc8b14646eee4de610da /tests
parent057c560ee45c61d172ed0ed762b0b33b37349e5c (diff)
parentfb13616518975b84eea9b9e0d5a91122bb1abe7a (diff)
downloadmariadb-git-e1ef99c3dcb8bb6fdea290e319d14f5a983d1785.tar.gz
MDEV-7145: Delayed replication
Merge feature into 10.2 from feature branch. Delayed replication adds an option CHANGE MASTER TO master_delay=<seconds> Replication will then delay applying events with that many seconds. This creates a replication slave that reflects the state of the master some time in the past. Feature is ported from MySQL source tree. 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 c855f25d674..54ac30861c1 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -461,7 +461,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 */