diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:42:22 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:42:22 +0200 |
| commit | 3a7c84066b02f3f32868a69fb1d6e7c5508347f1 (patch) | |
| tree | 5d72c9e47c88d4643b3354241a81f22fda24a3ad /sql/item_create.cc | |
| parent | c951bc08b118ea5586ce1519ca0fa981069378a5 (diff) | |
| parent | 3b42df6b76676676c5ba410be60c3b253bb46a43 (diff) | |
| download | mariadb-git-3a7c84066b02f3f32868a69fb1d6e7c5508347f1.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_insert.test:
Auto merged
mysql-test/t/ndb_replace.test:
Auto merged
mysql-test/t/ndb_update.test:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_row_inexist_tbl.test:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/item_create.cc:
Manual merge
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 309bd78b04e..0d85847cff7 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)); @@ -4541,7 +4541,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(); } @@ -4552,8 +4552,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(); } |