diff options
| author | unknown <chuck.bell@oracle.com> | 2012-01-30 10:23:21 -0500 |
|---|---|---|
| committer | unknown <chuck.bell@oracle.com> | 2012-01-30 10:23:21 -0500 |
| commit | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (patch) | |
| tree | 9a7f9e1c893fd7ee514374eec7e411810d5f2151 /sql/sql_prepare.cc | |
| parent | 461e039a07062f05082175edb1156725ac43b4c6 (diff) | |
| parent | 40bab62acff37c947e5d57203235ac0a6afc5f31 (diff) | |
| download | mariadb-git-7009bf411a8cb9a6e035b761b5e6352b4f474303.tar.gz | |
Merge with main for BUG#12969301
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 48b6886f6f2..cfdf7d27e58 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2195,6 +2195,9 @@ void mysqld_stmt_prepare(THD *thd, const char *packet, uint packet_length) thd->protocol= save_protocol; + sp_cache_enforce_limit(thd->sp_proc_cache, stored_program_cache_size); + sp_cache_enforce_limit(thd->sp_func_cache, stored_program_cache_size); + /* check_prepared_statemnt sends the metadata packet in case of success */ DBUG_VOID_RETURN; } @@ -2560,6 +2563,9 @@ void mysqld_stmt_execute(THD *thd, char *packet_arg, uint packet_length) stmt->execute_loop(&expanded_query, open_cursor, packet, packet_end); thd->protocol= save_protocol; + sp_cache_enforce_limit(thd->sp_proc_cache, stored_program_cache_size); + sp_cache_enforce_limit(thd->sp_func_cache, stored_program_cache_size); + /* Close connection socket; for use with client testing (Bug#43560). */ DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_close(thd->net.vio);); |