1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik
2017-08-08 10:18:43 +02:00
313 changed files with 36802 additions and 2097 deletions

View File

@@ -1,4 +1,5 @@
/* Copyright (c) 2005, 2012, Oracle and/or its affiliates.
/* Copyright (c) 2005, 2017, Oracle and/or its affiliates.
Copyright (c) 2009, 2017, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -176,7 +177,14 @@ public:
a different log under our feet
*/
uint32 cur_log_old_open_count;
/*
If on init_info() call error_on_rli_init_info is true that means
that previous call to init_info() terminated with an error, RESET
SLAVE must be executed and the problem fixed manually.
*/
bool error_on_rli_init_info;
/*
Let's call a group (of events) :
- a transaction