mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the new server getting started before the old one completely finished shutdown. This should fix the pid warning we've been getting as well as inconsistent results when running tests with the manager
This commit is contained in:
@@ -312,7 +312,6 @@ public:
|
||||
struct st_my_thread_var *mysys_var;
|
||||
enum enum_server_command command;
|
||||
uint32 server_id;
|
||||
uint32 file_id; // for LOAD DATA INFILE
|
||||
uint32 file_id; // for LOAD DATA INFILE
|
||||
const char *where;
|
||||
time_t start_time,time_after_lock,user_time;
|
||||
|
||||
Reference in New Issue
Block a user