Test for MDEV-39788

debian/mariadb-test-data.lintian-overrides

@@ -410,12 +410,16 @@ package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/mariadb-conv/file01.utf16.txt]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/mariadb-conv/file01.utf8.txt]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/mariadb-conv/file02.latin1.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/master-10.0.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/master-12.3.2.info]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/mysql5613mysql/README]
-package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/new-format-relay-log-win.info]
-package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/new-format-relay-log.info]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/numbers.txt]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/old-format-relay-log-win.info]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/old-format-relay-log.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/relay-log-10.0-win.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/relay-log-10.0.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/relay-log-12.3.2-win.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/relay-log-12.3.2.info]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/unicode/allkeys1400.txt]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/unicode/allkeys400.txt]
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/std_data/unicode/allkeys520.txt]

mysql-test/main/rpl_read_info.result

@@ -0,0 +1,14 @@
+CHANGE MASTER TO master_host='127.0.0.1';
+# restart: --skip-slave-start
+Master_Log_File = 'mysqld-bin.000002'
+Read_Master_Log_Pos = '2147483648'
+Master_SSL_Key = ''
+Using_Gtid = 'Current_Pos'
+Relay_Master_Log_File = 'mysqld-bin.000001'
+Exec_Master_Log_Pos = '2147483648'
+SQL_Delay = '5'
+# restart: --skip-slave-start
+Master_Log_File = 'mysqld-bin.000003'
+Using_Gtid = 'No'
+SQL_Delay = '10'
+RESET SLAVE ALL;

mysql-test/main/rpl_read_info.test

@@ -0,0 +1,64 @@
+# Verify that the post-WL#344 format of `*.info` can be parsed.
+# * Verify that the line count includes the line-count line in
+#   `@@master_info_file` while excludes it in `@@relay_log_info_file`
+#   (Reference: MDEV-39788 master.info is read and
+#    written one line too many compared to before)
+# * Verify that position values > 2^31 can be read
+#   (MDEV-38020: Master & relay log info files read 2^31 and above incorrectly)
+
+--source include/not_embedded.inc
+CHANGE MASTER TO master_host='127.0.0.1'; # have_info_files
+
+--let $MYSQLD_DATADIR= `SELECT @@datadir`
+
+# the new version of relay_log.info comes in two versions: with path
+# separator '/' (most systems) and with path separator '\' (windows)
+if ($SYSTEM_PATH_SEPARATOR != /) {
+  --let $file_suffix= -win
+}
+
+
+# Format established in 10.0
+
+--source include/shutdown_mysqld.inc
+
+  --remove_file $MYSQLD_DATADIR/master.info
+  # `Using_Gtid` is the `key=value` section, not the 33rd option.
+  --copy_file $MYSQL_TEST_DIR/std_data/master-10.0.info $MYSQLD_DATADIR/master.info
+
+  # Check that the 5th option (`SQL_Delay`) is included.
+  --remove_file $MYSQLD_DATADIR/relay-log.info
+  --copy_file $MYSQL_TEST_DIR/std_data/relay-log-10.0$file_suffix.info $MYSQLD_DATADIR/relay-log.info
+
+--let $restart_parameters= --skip-slave-start
+--source include/start_mysqld.inc
+
+--let $status_items= Master_Log_File, Read_Master_Log_Pos, Master_SSL_Key, Using_Gtid, Relay_Master_Log_File, Exec_Master_Log_Pos, SQL_Delay
+--source include/show_slave_status.inc
+
+
+
+# Compatibility test with erroneous files from 12.3.0-12.3.2
+# (from MDEV-37530, fixed in MDEV-39788)
+
+--source include/shutdown_mysqld.inc
+
+  --remove_file $MYSQLD_DATADIR/master.info
+  # `relay-log.info`-style `master.info`, where line 34 is a blank line,
+  # and the `key=value` section starts on line 35.
+  --copy_file $MYSQL_TEST_DIR/std_data/master-12.3.2.info $MYSQLD_DATADIR/master.info
+
+  # Extra ignored blank line in the file
+  --remove_file $MYSQLD_DATADIR/relay-log.info
+  --copy_file $MYSQL_TEST_DIR/std_data/relay-log-12.3.2$file_suffix.info $MYSQLD_DATADIR/relay-log.info
+
+--source include/start_mysqld.inc
+
+--let $status_items= Master_Log_File, Using_Gtid, SQL_Delay
+--source include/show_slave_status.inc
+
+
+# Reset
+--disable_warnings
+  RESET SLAVE ALL;
+--enable_warnings

mysql-test/std_data/master-10.0.info

@@ -0,0 +1,34 @@
+33
+mysqld-bin.000002
+2147483648
+127.0.0.1
+root
+
+3306
+60
+1
+
+
+
+
+
+1
+60.000
+
+0
+
+100000
+
+
+
+
+
+
+
+
+
+
+
+
+
+using_gtid=1

mysql-test/std_data/master-12.3.2.info

@@ -0,0 +1,50 @@
+33
+mysqld-bin.000003
+2147483648
+127.0.0.1
+root
+
+3306
+60
+1
+
+
+
+
+
+1
+60.000
+
+0
+
+100000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+do_domain_ids=0
+connect_retry
+ssl
+ignore_domain_ids=0
+ssl_ca
+ssl_cipher
+ssl_verify_server_cert
+ssl_capath
+ssl_cert
+ssl_key
+retry_count
+ssl_crlpath
+ssl_crl
+heartbeat_period
+using_gtid=0
+END_MARKER

mysql-test/std_data/relay-log-10.0-win.info

@@ -0,0 +1,6 @@
+5
+.\mysqld-relay-bin.000001
+4
+mysqld-bin.000001
+2147483648
+5

mysql-test/std_data/relay-log-10.0.info

@@ -0,0 +1,6 @@
+5
+./mysqld-relay-bin.000001
+4
+mysqld-bin.000001
+2147483648
+5

mysql-test/std_data/relay-log-12.3.2-win.info

@@ -0,0 +1,7 @@
+6
+.\mysqld-relay-bin.000001
+4
+mysqld-bin.000001
+2147483648
+10
+

mysql-test/std_data/relay-log-12.3.2.info

@@ -0,0 +1,7 @@
+6
+./mysqld-relay-bin.000001
+4
+mysqld-bin.000001
+2147483648
+10
+