diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 22:09:14 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 22:09:14 +0200 |
| commit | 6422d276fa8d1217aa68be1d90c712efa4d71409 (patch) | |
| tree | 67bc00215ac0bea9b6c14e51a0018a9d7f0cd886 /sql/wsrep_var.cc | |
| parent | 4a11e84414292e852a0968ef871dc90cbd24ae30 (diff) | |
| download | mariadb-git-6422d276fa8d1217aa68be1d90c712efa4d71409.tar.gz | |
bzr merge -r3895..3903 lp:codership-mysql/5.5
This is just before 5.5.34 merge in wsrep-5.5 branch
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index c3c795a291d..3f6b621a9f5 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -37,7 +37,7 @@ const char* wsrep_node_name = 0; const char* wsrep_node_address = 0; const char* wsrep_node_incoming_address = 0; const char* wsrep_start_position = 0; -ulong wsrep_OSU_method_options; +ulong wsrep_OSU_method_options; int wsrep_init_vars() { |