diff options
| author | Sven Sandberg <sven.sandberg@sun.com> | 2009-09-30 18:00:22 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@sun.com> | 2009-09-30 18:00:22 +0200 |
| commit | 3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c (patch) | |
| tree | 9294c1869671b21c13da2117df804e3a5b9a56a4 /sql/sql_udf.cc | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| parent | bfb1de9c065b6e9fd6b9fecb1c2db2b4475d3135 (diff) | |
| download | mariadb-git-3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c.tar.gz | |
merged fixes for BUG#39934 to 5.1-rpl+3
Also renamed current_stmt_binlog_row_based to
current_stmt_binlog_format_row for consistency
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index c60dac42fb8..bd5ce822ff1 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -437,8 +437,8 @@ int mysql_create_function(THD *thd,udf_func *udf) Turn off row binlogging of this statement and use statement-based so that all supporting tables are updated for CREATE FUNCTION command. */ - if (thd->current_stmt_binlog_row_based) - thd->clear_current_stmt_binlog_row_based(); + if (thd->is_current_stmt_binlog_format_row()) + thd->clear_current_stmt_binlog_format_row(); rw_wrlock(&THR_LOCK_udf); if ((hash_search(&udf_hash,(uchar*) udf->name.str, udf->name.length))) @@ -540,8 +540,8 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name) Turn off row binlogging of this statement and use statement-based so that all supporting tables are updated for DROP FUNCTION command. */ - if (thd->current_stmt_binlog_row_based) - thd->clear_current_stmt_binlog_row_based(); + if (thd->is_current_stmt_binlog_format_row()) + thd->clear_current_stmt_binlog_format_row(); rw_wrlock(&THR_LOCK_udf); if (!(udf=(udf_func*) hash_search(&udf_hash,(uchar*) udf_name->str, |