1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik
2016-03-21 13:02:53 +01:00
142 changed files with 383 additions and 286 deletions

View File

@ -319,7 +319,7 @@ struct rpl_parallel_entry {
group here. Then later event groups (with higher sub_id) can know not to
try to start (event groups that already started will be rolled back when
wait_for_prior_commit() returns error).
The value is ULONGLONG_MAX when no error occured.
The value is ULONGLONG_MAX when no error occurred.
*/
uint64 stop_on_error_sub_id;
/*