summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <aelkin@dl145j.mysql.com>2007-12-13 09:33:19 +0100
committerunknown <aelkin@dl145j.mysql.com>2007-12-13 09:33:19 +0100
commit5c48e54fdbb3a618ce81e7f04bb43bb846943f42 (patch)
tree4274e6efa01392efa8a0ca423cef80c4c72c43f9
parent296c2ea8ac00cbcc256782c371a74a2afdb34248 (diff)
parent3473d97857d4b48be9c1d1478040ef67f09ee3be (diff)
downloadmariadb-git-5c48e54fdbb3a618ce81e7f04bb43bb846943f42.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into dl145j.mysql.com:/tmp/andrei/bug31552
-rw-r--r--sql/log_event.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 2490e54282f..db0a5c2b53a 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -46,7 +46,7 @@
#define FMT_G_BUFSIZE(PREC) (3 + (PREC) + 5 + 1)
-#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) && !defined(DBUG_OFF) && !defined(_lint)
+#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
static const char *HA_ERR(int i)
{
switch (i) {