summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-10-20 17:02:59 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-10-20 17:02:59 -0200
commit1e1985eba70a9f18a7ea129a869bcd7e219419c4 (patch)
tree8b9671ed7e4c19f1f97d8f8347422f15f2432a03 /sql/log.cc
parentffeb96ecc390432049bd85f2c6a1e6c94871e857 (diff)
parent560ee2158d17212ecb2ec282ee15b1e1eb5f2092 (diff)
downloadmariadb-git-1e1985eba70a9f18a7ea129a869bcd7e219419c4.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 68ae6fd724e..ae0cb813742 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1362,7 +1362,7 @@ void LOGGER::deactivate_log_handler(THD *thd, uint log_type)
file_log= file_log_handler->get_mysql_log();
break;
default:
- assert(0); // Impossible
+ MY_ASSERT_UNREACHABLE();
}
if (!(*tmp_opt))