diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-06 00:29:37 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-06 00:29:37 +0200 |
| commit | 2b4183f10b54a5b3f8c848d897b3107859c23fa4 (patch) | |
| tree | 5d48ff3f0a9814926ba59b7adae1d056c57b54c8 /sql/wsrep_var.cc | |
| parent | 9129c8f1d3e1f8c9daeae559eaf6b9807b4331ec (diff) | |
| download | mariadb-git-2b4183f10b54a5b3f8c848d897b3107859c23fa4.tar.gz | |
bzr merge -r3890..3891 lp:codership-mysql/5.5
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 17e8de9ba6b..bd041ed51ff 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -13,12 +13,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "wsrep_var.h" + #include <mysqld.h> #include <sql_class.h> #include <sql_plugin.h> #include <set_var.h> #include <sql_acl.h> #include "wsrep_priv.h" +#include "wsrep_thd.h" #include <my_dir.h> #include <cstdio> #include <cstdlib> @@ -157,7 +160,7 @@ void wsrep_start_position_init (const char* val) if (NULL == val || wsrep_start_position_verify (val)) { WSREP_ERROR("Bad initial value for wsrep_start_position: %s", - (val ? val : "")); + (val ? val : "")); return; } @@ -173,7 +176,7 @@ static bool refresh_provider_options() { if (wsrep_provider_options) my_free((void *)wsrep_provider_options); wsrep_provider_options = (char*)my_memdup(opts, strlen(opts) + 1, - MYF(MY_WME)); + MYF(MY_WME)); } else { |