diff options
| author | tsmith@maint1.mysql.com <> | 2007-06-21 22:10:40 +0200 |
|---|---|---|
| committer | tsmith@maint1.mysql.com <> | 2007-06-21 22:10:40 +0200 |
| commit | 28242f775c8dd21dbb6790804f045b4bff1c608d (patch) | |
| tree | 57c6bc355735b8ca5fd1bf9be3cf82499f9843e1 /sql/item_create.cc | |
| parent | 8ee2c2b04ecef1bddd72b0ea9ca846333e9be655 (diff) | |
| parent | 6e2ef9a6fa590708e680da18e97a146cc6a2e11c (diff) | |
| download | mariadb-git-28242f775c8dd21dbb6790804f045b4bff1c608d.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index b3522ba352c..20041b1176a 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2354,7 +2354,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)); @@ -4542,7 +4542,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(); thd->lex->safe_to_cache_query= 0; return new (thd->mem_root) Item_func_uuid(); } @@ -4553,8 +4553,8 @@ 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->safe_to_cache_query= 0; + thd->lex->set_stmt_unsafe(); + thd->lex->safe_to_cache_query= 0; return new (thd->mem_root) Item_func_uuid_short(); } |