summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.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
commitf620cae97431c9975edac92d4bd700a9c820913d (patch)
treebf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/sql_trigger.cc
parent06bfaf21f2965539ab76fed3338b3cb0089adc57 (diff)
parent85f3e8ce24e46516af540e08dfd51235a386fadf (diff)
downloadmariadb-git-f620cae97431c9975edac92d4bd700a9c820913d.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 7b689167783..61da4617610 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -409,7 +409,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
*/
result= FALSE;
/* Still, we need to log the query ... */
- stmt_query.append(thd->query, thd->query_length);
+ stmt_query.append(thd->query(), thd->query_length());
goto end;
}
}
@@ -918,7 +918,7 @@ bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables,
List_iterator<LEX_STRING> it_connection_cl_name(connection_cl_names);
List_iterator<LEX_STRING> it_db_cl_name(db_cl_names);
- stmt_query->append(thd->query, thd->query_length);
+ stmt_query->append(thd->query(), thd->query_length());
while ((name= it_name++))
{