From dae79f0a501ea21ee4b6c712d4bd17e138dca2d2 Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Fri, 20 Oct 2006 22:21:05 -0400
Subject: [PATCH] Fix bad merge.

---
 sql/sql_trigger.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 70053e54df0..9dce838496d 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -284,7 +284,7 @@ end:
       thd->clear_error();
 
       /* Such a statement can always go directly to binlog, no trans cache. */
-      thd->binlog_query(THD::MYSQL_STMT_TYPE,
+      thd->binlog_query(THD::STMT_QUERY_TYPE,
                         stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);
     }
   }