diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
| commit | 84a4db263a1d98e9a2f3c6b5816a9b6b9a019128 (patch) | |
| tree | 34e88fe5c34eef90f550fe96aec38934ac00fc55 /sql/mysqld.cc | |
| parent | 555915faa9fc5ec0a7df09b51716be027120fa8c (diff) | |
| parent | d7445ea6dfbd3be390792c636f755d3bb40d5fbf (diff) | |
| download | mariadb-git-84a4db263a1d98e9a2f3c6b5816a9b6b9a019128.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6faa52abb7a..eb5c233af41 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1954,7 +1954,8 @@ static void __cdecl kill_server(int sig_ptr) } #endif #ifdef WITH_WSREP - if (WSREP_ON) wsrep_stop_replication(NULL); + /* Stop wsrep threads in case they are running. */ + wsrep_stop_replication(NULL); #endif close_connections(); |