diff options
| author | lars/lthalmann@dl145j.mysql.com <> | 2007-01-12 12:31:44 +0100 |
|---|---|---|
| committer | lars/lthalmann@dl145j.mysql.com <> | 2007-01-12 12:31:44 +0100 |
| commit | 1e356251a0838095863e0ed069ec4135752f5123 (patch) | |
| tree | 8f05ed2f7b6984f4ca7df8e1eafad42a9d4235e2 /sql/item_create.cc | |
| parent | ebb4885357428d10aaa1628f860e1457de80d91b (diff) | |
| parent | baf42721521eaa1258f5c26311ac6ccf860369fd (diff) | |
| download | mariadb-git-1e356251a0838095863e0ed069ec4135752f5123.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index b7656fc8c4f..ff5825ef389 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2341,9 +2341,7 @@ Create_udf_func::create(THD *thd, udf_func *udf, List<Item> *item_list) if (item_list != NULL) arg_count= item_list->elements; -#ifdef HAVE_ROW_BASED_REPLICATION thd->lex->binlog_row_based_if_mixed= TRUE; -#endif DBUG_ASSERT( (udf->type == UDFTYPE_FUNCTION) || (udf->type == UDFTYPE_AGGREGATE)); @@ -4532,9 +4530,7 @@ Create_func_uuid Create_func_uuid::s_singleton; Item* Create_func_uuid::create(THD *thd) { -#ifdef HAVE_ROW_BASED_REPLICATION thd->lex->binlog_row_based_if_mixed= TRUE; -#endif return new (thd->mem_root) Item_func_uuid(); } |