diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:28:25 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:28:25 +0300 |
| commit | e6d79c2bc99e302a31fc0bbc885e8c6407092eba (patch) | |
| tree | 894961090682e834a390c1897a2aa0d5b5a58a9a /sql/sql_prepare.cc | |
| parent | ea0bbb72480c8ad14370cbe9388e688601fbc6e9 (diff) | |
| parent | 120425ccfda32bb439c3f510f41532cfe3aa79de (diff) | |
| download | mariadb-git-e6d79c2bc99e302a31fc0bbc885e8c6407092eba.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 55b97a09617..168934206e5 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3753,7 +3753,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) if (query_cache_send_result_to_client(thd, thd->query(), thd->query_length()) <= 0) { - MYSQL_QUERY_EXEC_START(thd->query, + MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), thd->security_ctx->priv_user, |