summaryrefslogtreecommitdiff
path: root/sql/sql_udf.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-05 23:28:35 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-05 23:28:35 +0300
commitcd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch)
treebf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/sql_udf.cc
parent16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff)
parentb30c1886dc52153009c2ea67878a9763448f461e (diff)
downloadmariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_udf.cc')
-rw-r--r--sql/sql_udf.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 141bf76df1a..a1a0d9633b7 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -506,7 +506,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
rw_unlock(&THR_LOCK_udf);
/* Binlog the create function. */
- write_bin_log(thd, TRUE, thd->query, thd->query_length);
+ write_bin_log(thd, TRUE, thd->query(), thd->query_length());
DBUG_RETURN(0);
@@ -581,7 +581,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
rw_unlock(&THR_LOCK_udf);
/* Binlog the drop function. */
- write_bin_log(thd, TRUE, thd->query, thd->query_length);
+ write_bin_log(thd, TRUE, thd->query(), thd->query_length());
DBUG_RETURN(0);
err: