diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
| commit | cd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch) | |
| tree | bf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/sp_head.cc | |
| parent | 16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff) | |
| parent | b30c1886dc52153009c2ea67878a9763448f461e (diff) | |
| download | mariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index eb9ee6eeebf..3c610c1fdf0 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2859,8 +2859,8 @@ sp_instr_stmt::execute(THD *thd, uint *nextp) DBUG_ENTER("sp_instr_stmt::execute"); DBUG_PRINT("info", ("command: %d", m_lex_keeper.sql_command())); - query= thd->query; - query_length= thd->query_length; + query= thd->query(); + query_length= thd->query_length(); #if defined(ENABLED_PROFILING) /* This s-p instr is profilable and will be captured. */ thd->profiling.set_query_source(m_query.str, m_query.length); @@ -2873,10 +2873,11 @@ sp_instr_stmt::execute(THD *thd, uint *nextp) queries with SP vars can't be cached) */ if (unlikely((thd->options & OPTION_LOG_OFF)==0)) - general_log_write(thd, COM_QUERY, thd->query, thd->query_length); + general_log_write(thd, COM_QUERY, thd->query(), thd->query_length()); if (query_cache_send_result_to_client(thd, - thd->query, thd->query_length) <= 0) + thd->query(), + thd->query_length()) <= 0) { res= m_lex_keeper.reset_lex_and_exec_core(thd, nextp, FALSE, this); |