diff options
| author | Mikael Ronström <mikael@dator9> | 2011-04-15 15:46:11 +0200 |
|---|---|---|
| committer | Mikael Ronström <mikael@dator9> | 2011-04-15 15:46:11 +0200 |
| commit | 7b079a3a7e3a7e38353728e8e19a1ea44a2f5778 (patch) | |
| tree | a3b95707a820bf6af5adbb68c73f6f51dbf5b473 /sql/sp_head.cc | |
| parent | 97036a97a186a7eddf9d36a987338f2144aefa1d (diff) | |
| parent | 506ff594c8553723770e9f097c0e72c31859d7ad (diff) | |
| download | mariadb-git-7b079a3a7e3a7e38353728e8e19a1ea44a2f5778.tar.gz | |
Merge 5.5
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 000d5582be4..5841091a976 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -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 |