summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-04-08 09:39:33 +0200
committerunknown <knielsen@knielsen-hq.org>2011-04-08 09:39:33 +0200
commit64e43e1cc88c66bd89f95a5307020bcf60ba4b96 (patch)
tree1ae6299d5a75f92fa97b240b0670c81c9a301afe /sql/set_var.cc
parent8b427b7d5548aeb214c70b004cc9056b9f7a6f7c (diff)
parent86008e0ca2b864f1ab7a30e496d7c67c8fce06c2 (diff)
downloadmariadb-git-64e43e1cc88c66bd89f95a5307020bcf60ba4b96.tar.gz
Merge various replication-related patches into MariaDB 5.3:
- MWL#116 Group commit - MWL#136 Enhancements for START TRANSACTION WITH CONSISTENT SNAPSHOT - MWL#47 Annotate_rows_log_event - MWL#163 innodb_release_locks_early - Percona patch enhancing row-based replication for tables with no primary key
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b02330727e9..33575de1ccf 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -183,6 +183,9 @@ static sys_var_const sys_back_log(&vars, "back_log",
OPT_GLOBAL, SHOW_LONG,
(uchar*) &back_log);
static sys_var_const_os_str sys_basedir(&vars, "basedir", mysql_home);
+static sys_var_thd_bool
+sys_binlog_annotate_rows_events(&vars, "binlog_annotate_rows_events",
+ &SV::binlog_annotate_rows_events);
static sys_var_long_ptr sys_binlog_cache_size(&vars, "binlog_cache_size",
&binlog_cache_size);
static sys_var_thd_binlog_format sys_binlog_format(&vars, "binlog_format",