diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
| commit | db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d (patch) | |
| tree | bbfe50d2fc0a5dc85adedfa669b350604759b382 /sql/item_create.cc | |
| parent | 80af30efe10621b7c2b64f98cf957e0c1b5b5f8d (diff) | |
| parent | e9adcac2e8f663dbfda38ea917e00ca8af18440c (diff) | |
| download | mariadb-git-db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d.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
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.h:
Manual merge.
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(); } |