From 7965816fffff06f95c7cebe57909666041d0ea4f Mon Sep 17 00:00:00 2001
From: "lars/lthalmann@mysql.com/dl145h.mysql.com" <>
Date: Tue, 5 Jun 2007 03:02:59 +0200
Subject: Manual merge

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

(limited to 'sql/item_create.cc')

diff --git a/sql/item_create.cc b/sql/item_create.cc
index fcac4474cd6..0daba3e23a8 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -4551,7 +4551,7 @@ Create_func_uuid_short Create_func_uuid_short::s_singleton;
 Item*
 Create_func_uuid_short::create(THD *thd)
 {
-  thd->lex->binlog_row_based_if_mixed= TRUE;
+  thd->lex->set_stmt_unsafe();
   return new (thd->mem_root) Item_func_uuid_short();
 }
 
-- 
cgit v1.2.1