diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
| commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
| tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /sql/wsrep_utils.cc | |
| parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
| parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
| download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz | |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
Diffstat (limited to 'sql/wsrep_utils.cc')
| -rw-r--r-- | sql/wsrep_utils.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index a6d7dcdbfc8..00919b3163e 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -289,13 +289,14 @@ process::wait () return err_; } -thd::thd () : init(), ptr(new THD) +thd::thd (my_bool won) : init(), ptr(new THD) { if (ptr) { ptr->thread_stack= (char*) &ptr; ptr->store_globals(); ptr->variables.option_bits&= ~OPTION_BIN_LOG; // disable binlog + ptr->variables.wsrep_on = won; ptr->security_ctx->master_access= ~(ulong)0; lex_start(ptr); } |