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

weave merge of mysql-5.5->mysql-5.5-security

Browse Source
This commit is contained in:
Georgi Kodinov
2011-05-10 17:20:26 +03:00
parent 6ed5d97801 2b9c0451f7
commit 712f2d3833
199 changed files with 4845 additions and 1738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sp_head.cc
View File

@@ -1,4 +1,4 @@
/* Copyright 2002-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
@@ -1217,7 +1217,8 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
String old_packet;
Reprepare_observer *save_reprepare_observer= thd->m_reprepare_observer;
Object_creation_ctx *saved_creation_ctx;
Warning_info *saved_warning_info, warning_info(thd->warning_info->warn_id());
Warning_info *saved_warning_info;
Warning_info warning_info(thd->warning_info->warn_id(), false);
/*
Just reporting a stack overrun error