diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-30 19:25:06 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-30 19:25:06 -0300 |
| commit | 436ccb69843a4a91222f723c4ef009107e3e5d3f (patch) | |
| tree | af44a4295dc8e6bee81b2057010cfdab45ecb3a6 /sql/slave.cc | |
| parent | b29966b04e547c15cec37a37cbd0746524e94f63 (diff) | |
| parent | e218ac06ed3721e6b5496e1954fc9afd9d95cf24 (diff) | |
| download | mariadb-git-436ccb69843a4a91222f723c4ef009107e3e5d3f.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 66cbef1029a..82c9d035fd2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3761,7 +3761,7 @@ extern "C" void slave_io_thread_detach_vio() { #ifdef SIGNAL_WITH_VIO_CLOSE THD *thd= current_thd; - if (thd->slave_thread) + if (thd && thd->slave_thread) thd->clear_active_vio(); #endif } |