summaryrefslogtreecommitdiff
path: root/sql/sys_vars.h
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2015-02-06 10:02:02 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2015-02-07 09:42:58 +0100
commit8672339328c30c894b4062f94c4fb0510fb20f9a (patch)
tree684a4dfb1b8269276e3602e3d716683aa369846a /sql/sys_vars.h
parent734c4c01439488781837196ff09ad5f2c5276ead (diff)
downloadmariadb-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/sys_vars.h')
-rw-r--r--sql/sys_vars.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h
index a19102be6ec..61af931c189 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.h
@@ -2312,14 +2312,15 @@ public:
/**
Class for connection_name.slave_parallel_mode.
*/
-class Sys_var_slave_parallel_mode: public Sys_var_set
+class Sys_var_slave_parallel_mode: public Sys_var_enum
{
public:
Sys_var_slave_parallel_mode(const char *name_arg,
const char *comment, int flag_args, ptrdiff_t off, size_t size,
- CMD_LINE getopt, const char *values[], ulonglong def_val)
- : Sys_var_set(name_arg, comment, flag_args, off, size,
- getopt, values, def_val)
+ CMD_LINE getopt, const char *values[],
+ enum_slave_parallel_mode def_val)
+ : Sys_var_enum(name_arg, comment, flag_args, off, size,
+ getopt, values, def_val)
{
option.var_type|= GET_ASK_ADDR;
option.value= (uchar**)1; // crash me, please