848191a380
http://bugs.mysql.com/22227 ulong fix http://bugs.mysql.com/21327 OpenSSL build fix http://bugs.mysql.com/18630 security context issue fix http://bugs.mysql.com/17647 case-sensitive fs issue fix CVE-2006-4226, CVE-2006-4227
47 lines
1.4 KiB
Plaintext
47 lines
1.4 KiB
Plaintext
$OpenBSD: patch-sql_sql_parse_cc,v 1.4 2006/10/03 04:52:03 brad Exp $
|
|
--- sql/sql_parse.cc.orig Fri Aug 25 17:12:28 2006
|
|
+++ sql/sql_parse.cc Mon Oct 2 11:28:32 2006
|
|
@@ -4383,9 +4383,6 @@ end_with_restore_list:
|
|
}
|
|
else
|
|
{
|
|
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
- Security_context *save_ctx;
|
|
-#endif
|
|
ha_rows select_limit;
|
|
/* bits that should be cleared in thd->server_status */
|
|
uint bits_to_be_cleared= 0;
|
|
@@ -4427,21 +4424,11 @@ end_with_restore_list:
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
if (check_routine_access(thd, EXECUTE_ACL,
|
|
- sp->m_db.str, sp->m_name.str, TRUE, 0) ||
|
|
- sp_change_security_context(thd, sp, &save_ctx))
|
|
+ sp->m_db.str, sp->m_name.str, TRUE, FALSE))
|
|
{
|
|
thd->net.no_send_ok= nsok;
|
|
goto error;
|
|
}
|
|
- if (save_ctx &&
|
|
- check_routine_access(thd, EXECUTE_ACL,
|
|
- sp->m_db.str, sp->m_name.str, TRUE, 0))
|
|
- {
|
|
- thd->net.no_send_ok= nsok;
|
|
- sp_restore_security_context(thd, save_ctx);
|
|
- goto error;
|
|
- }
|
|
-
|
|
#endif
|
|
select_limit= thd->variables.select_limit;
|
|
thd->variables.select_limit= HA_POS_ERROR;
|
|
@@ -4465,9 +4452,6 @@ end_with_restore_list:
|
|
thd->total_warn_count= 0;
|
|
|
|
thd->variables.select_limit= select_limit;
|
|
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
- sp_restore_security_context(thd, save_ctx);
|
|
-#endif
|
|
|
|
thd->net.no_send_ok= nsok;
|
|
thd->server_status&= ~bits_to_be_cleared;
|