diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
| commit | efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e (patch) | |
| tree | 9eb3b78e20ecf4bd9e5cd587db50d51c1f06d336 /sql/slave.cc | |
| parent | a7f87effa57f6486c23bf5b340c8474a635dcf71 (diff) | |
| parent | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff) | |
| download | mariadb-git-efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e.tar.gz | |
Merge with 5.1
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 813cf20464e..ff12a660883 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -513,7 +513,7 @@ terminate_slave_thread(THD *thd, while (*slave_running) // Should always be true { - int error; + int error __attribute__((unused)); DBUG_PRINT("loop", ("killing slave thread")); pthread_mutex_lock(&thd->LOCK_thd_data); |