diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-02-06 10:02:02 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-02-07 09:42:58 +0100 |
| commit | 8672339328c30c894b4062f94c4fb0510fb20f9a (patch) | |
| tree | 684a4dfb1b8269276e3602e3d716683aa369846a /sql/share | |
| parent | 734c4c01439488781837196ff09ad5f2c5276ead (diff) | |
| download | mariadb-git-8672339328c30c894b4062f94c4fb0510fb20f9a.tar.gz | |
MDEV-6676: Optimistic parallel replication
Adjust the configuration options, as discussed on the
maria-developers@ mailing list.
The option to hint a transaction to not be replicated in parallel is
now called @@skip_parallel_replication, consistent with
@@skip_replication.
And the --slave-parallel-mode is now simplified to have just one of
the following values:
none
minimal
conservative
optimistic
aggressive
This reflects successively harder efforts to find opportunities to run
things in parallel on the slave. It allows to extend the server with
more automatic heuristics in the future without having to introduce a
new configuration option for each and every one.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index a5d3ba19b2f..381370e9d4e 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7115,8 +7115,8 @@ ER_SUBQUERIES_NOT_SUPPORTED 42000 eng "%s does not support subqueries or stored functions." ER_SET_STATEMENT_NOT_SUPPORTED 42000 eng "The system variable %.200s cannot be set in SET STATEMENT." -ER_INVALID_SLAVE_PARALLEL_MODE - eng "Invalid use of '%s' option for slave_parallel_mode" +ER_UNUSED_17 + eng "You should never see it" ER_USER_CREATE_EXISTS eng "Can't create user '%-.64s'@'%-.64s'; it already exists" ER_USER_DROP_EXISTS |