diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
| commit | cd2edad8b3ee4e3791c3850f81ba5afd826976d2 (patch) | |
| tree | d02a2237b2c459c7c03d3e376cba150da65776c1 /sql/item_create.cc | |
| parent | 0520bf46cbd4a9e2f3c0ad4ae8c37e0992331703 (diff) | |
| parent | a242b20d3660794f29329423e3ce449036bce1c1 (diff) | |
| download | mariadb-git-cd2edad8b3ee4e3791c3850f81ba5afd826976d2.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
configure.in:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.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/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
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(); } |