diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 17:54:42 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 17:54:42 +0200 |
| commit | 800fa186e3ab77ee93e75e929fe7917983e607e9 (patch) | |
| tree | c5cc3e52e73f2469e5ef3f96249938699516d8df /sql/sys_vars.cc | |
| parent | 9da9a242faf1fd7b2f45dc0561e5bf742a7be47b (diff) | |
| download | mariadb-git-800fa186e3ab77ee93e75e929fe7917983e607e9.tar.gz | |
merged with codership-mysql up to revision 3839
bzr merge -r3810..3839 lp:codership-mysql/5.5
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 1efe724e6f9..e3df253f873 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3662,7 +3662,7 @@ static Sys_var_charptr Sys_wsrep_cluster_address ( static Sys_var_charptr Sys_wsrep_node_name ( "wsrep_node_name", "Node name", GLOBAL_VAR(wsrep_node_name), CMD_LINE(REQUIRED_ARG), - IN_FS_CHARSET, DEFAULT(glob_hostname), + IN_FS_CHARSET, DEFAULT(wsrep_node_name), NO_MUTEX_GUARD, NOT_IN_BINLOG); static Sys_var_charptr Sys_wsrep_node_address ( |