diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 17:51:00 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 17:51:00 +0300 |
| commit | 120425ccfda32bb439c3f510f41532cfe3aa79de (patch) | |
| tree | 66fdd703f7b1920dc0393b84b8a70c46922bc43a /sql/sql_cursor.cc | |
| parent | 45c2de8ffdae93625bdcbdf2f82d0207253d61b9 (diff) | |
| download | mariadb-git-120425ccfda32bb439c3f510f41532cfe3aa79de.tar.gz | |
Fix automerge: use 'thd->query()' instead of 'thd->query'.
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 553342f155b..51d5a1cec23 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -169,7 +169,7 @@ int mysql_open_cursor(THD *thd, uint flags, select_result *result, thd->lock_id= sensitive_cursor->get_lock_id(); thd->cursor= sensitive_cursor; } - 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, |