diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-05-31 20:17:31 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-05-31 20:17:31 +0200 |
| commit | 5c662d6d7c5f50b3c7352823ff12892b6ab0e28e (patch) | |
| tree | bbfe50d2fc0a5dc85adedfa669b350604759b382 /sql/item_create.cc | |
| parent | 685293b98584b36c568bd6a4fa6ded69f6ce5844 (diff) | |
| parent | b1bd9a6c4f477fc6aba81ee3dc91383c860dbaff (diff) | |
| download | mariadb-git-5c662d6d7c5f50b3c7352823ff12892b6ab0e28e.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 62f44996f4b..5dd09bc7b2c 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2341,7 +2341,7 @@ Create_udf_func::create(THD *thd, udf_func *udf, List<Item> *item_list) if (item_list != NULL) arg_count= item_list->elements; - thd->lex->binlog_row_based_if_mixed= TRUE; + thd->lex->set_stmt_unsafe(); DBUG_ASSERT( (udf->type == UDFTYPE_FUNCTION) || (udf->type == UDFTYPE_AGGREGATE)); @@ -4528,7 +4528,7 @@ Create_func_uuid Create_func_uuid::s_singleton; Item* Create_func_uuid::create(THD *thd) { - thd->lex->binlog_row_based_if_mixed= TRUE; + thd->lex->set_stmt_unsafe(); return new (thd->mem_root) Item_func_uuid(); } |