database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Post-merge fixes.

Browse Source 
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
This commit is contained in:
pem@mysql.comhem.se
2004-05-14 16:00:57 +02:00
parent bf45960eef
commit ec92106535
19 changed files with 340 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@@ -3434,6 +3434,7 @@ unsent_create_error:
#ifndef NO_EMBEDDED_ACCESS_CHECKS
st_sp_security_context save_ctx;
#endif
ha_rows select_limit;
uint smrx;
LINT_INIT(smrx);
@@ -3468,9 +3469,12 @@ unsent_create_error:
#ifndef NO_EMBEDDED_ACCESS_CHECKS
sp_change_security_context(thd, sp, &save_ctx);
#endif
select_limit= thd->variables.select_limit;
thd->variables.select_limit= HA_POS_ERROR;
res= sp->execute_procedure(thd, &lex->value_list);
thd->variables.select_limit= select_limit;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
sp_restore_security_context(thd, sp, &save_ctx);
#endif