RE: bzr commit into mysql-6.0 branch (ogrovlen:2632) Bug#36586, Bug#36624

[Chuck Bell]

Oops. Sent email too soon. There were 2 other things....

1) The test fails with the latest pull from mysql-6.0-backup on Windows.
Comments suggest that the code should have failed, but in this case it
passed causing a test failure.

main.backup_multi_blocks       [ fail ]

mysqltest: At line 22: query 'RESTORE FROM 'test.ba'' succeeded - should
have failed with errno 1698...

2) Do not use hard-coded error values for the --error command. The
following:

> +--error 1698

...should be:

--error ER_BACKUP_READ_SUMMARY

This allows us to alter the errmsg.txt file and generate new error messages
without breaking tests. This happens most frequenly in merges from other
trees.

Chuck