Manual merge

7965816f · lars/lthalmann@mysql.com/dl145h.mysql.com · f402776d · 7965816f
Commit 7965816f authored Jun 05, 2007 by lars/lthalmann@mysql.com/dl145h.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_create.cc sql/item_create.cc +1 -1

No files found.
--- 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();
 }