diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:53:46 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:53:46 +0300 |
| commit | 4f2b3cd38d3aee3d1ad7587efd74394ba2edf4a1 (patch) | |
| tree | 6f31262b2aae660a5536bb962c312d14b320ed47 /sql/sp_head.cc | |
| parent | cad931d6282a17af3f4bc5f91ecaf3ce7b9469d3 (diff) | |
| parent | 29d840ee47c0e6406cbde7b1d878643d0b25e1ce (diff) | |
| download | mariadb-git-4f2b3cd38d3aee3d1ad7587efd74394ba2edf4a1.tar.gz | |
merge of mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 19bee87c9ca..411b18e86ea 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1,4 +1,4 @@ -/* Copyright 2002-2008 MySQL AB, 2008 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "mysql_priv.h" #ifdef USE_PRAGMA_IMPLEMENTATION @@ -1060,7 +1060,7 @@ void sp_head::recursion_level_error(THD *thd) if (m_type == TYPE_ENUM_PROCEDURE) { my_error(ER_SP_RECURSION_LIMIT, MYF(0), - thd->variables.max_sp_recursion_depth, + static_cast<int>(thd->variables.max_sp_recursion_depth), m_name.str); } else |