diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-30 21:26:31 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-30 21:26:31 +0200 |
commit | 1d8cfe3c775d69b169750f13dc299763e4e346b2 (patch) | |
tree | 0c263334c3a459ed513bb34560f864d430700bf0 /mysql-test/include | |
parent | 6f20e3a3858aedfd244ba6185104dacd89dfdd55 (diff) | |
download | mariadb-git-1d8cfe3c775d69b169750f13dc299763e4e346b2.tar.gz |
LP686006 : maria recovery tests fail.
All failing cases were attempts to use connection after
the server was brought down and restarted. Connections
used client reconnect option.
The reason for failures is the behavior of sockets on Windows:
for a short period after crash (short enough to make the error
not reproducible under debugger), write to socket on client
side would succeed but subsequent read would fail.
MYSQL_OPT_RECONNECT does not really help in this case ,
because in the case given here ,as mysql_real_query()
(which can handle reconnect option) succeeds and
mysql_read_results() (can't handle reconnect) fails.
The fix is adding --include wait_until_connected_again.inc to
appropriate places in test. This ensures that read errors are
caught and connection is recreated.
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/maria_make_snapshot_for_comparison.inc | 1 | ||||
-rw-r--r-- | mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/maria_make_snapshot_for_comparison.inc b/mysql-test/include/maria_make_snapshot_for_comparison.inc index cb756f60527..0c71bd10408 100644 --- a/mysql-test/include/maria_make_snapshot_for_comparison.inc +++ b/mysql-test/include/maria_make_snapshot_for_comparison.inc @@ -8,6 +8,7 @@ # cover tables mysqltest.$mms_tname1,...$mms_tnameN connection admin; +--source include/wait_until_connected_again.inc let $mms_table_to_use=$mms_tables; let $mms_purpose=comparison; diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc index dc706174b7c..fded4cb83b4 100644 --- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc +++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc @@ -11,6 +11,7 @@ connection admin; +--source include/wait_until_connected_again.inc let $mms_table_to_use=$mms_tables; let $mms_purpose=feeding_recovery; |