1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual merge

This commit is contained in:
2010-05-26 22:34:25 +08:00
198 changed files with 3603 additions and 10089 deletions

View File

@ -80,5 +80,5 @@ if (!$_slave_timeout_counter)
--echo Current connection is '$CURRENT_CONNECTION'
echo Note: the following output may have changed since the failure was detected;
source include/show_rpl_debug_info.inc;
exit;
die;
}