summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-22 15:21:43 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-22 15:21:43 +0300
commit9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (patch)
tree87992f23022a4fdd0e722ced5388e0fe0ea1a5e9 /mysql-test/suite/binlog
parent78efa1093076307946873f322b45a14d1ed5ffb0 (diff)
parent4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff)
downloadmariadb-git-9d0ee2dcb72c011b4ee73c578cc32b666297ca31.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/binlog')
-rw-r--r--mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result3
-rw-r--r--mysql-test/suite/binlog/t/binlog_show_binlog_event_random_pos.test5
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result b/mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result
index 358422c5842..c2e634ebe82 100644
--- a/mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result
+++ b/mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result
@@ -9,4 +9,7 @@ INSERT INTO t1 VALUES (repeat('a', 255), repeat('a', 255),repeat('a', 255),repea
INSERT INTO t1 VALUES (repeat('a', 255), repeat('a', 255),repeat('a', 255),repeat('a', 255),repeat('a', 255));
UPDATE t1 SET c1=repeat('b',255);
INSERT INTO t1 VALUES (repeat('a', 255), repeat('a', 255),repeat('a', 255),repeat('a', 255),repeat('a', 255));
+SHOW BINLOG EVENTS FROM POS;
+ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Invalid pos specified. Requested from pos:POS is greater than actual file size:MAX_POS
+
DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_show_binlog_event_random_pos.test b/mysql-test/suite/binlog/t/binlog_show_binlog_event_random_pos.test
index e6a9e1cb2c1..05e6967c538 100644
--- a/mysql-test/suite/binlog/t/binlog_show_binlog_event_random_pos.test
+++ b/mysql-test/suite/binlog/t/binlog_show_binlog_event_random_pos.test
@@ -34,4 +34,9 @@ while ($pos <= $max_pos)
--enable_query_log
}
+# Testing a case where input position is greater than actual binlog file size.
+--replace_result $pos POS $max_pos MAX_POS
+--error 1220
+eval SHOW BINLOG EVENTS FROM $pos;
+
DROP TABLE t1;