Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153

into  adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sp_head.h b/sql/sp_head.h
index 3a8b41acd4c..93040bc3ca0 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -269,10 +269,10 @@ public:
   Security_context m_security_ctx;
 
   static void *
-  operator new(size_t size);
+  operator new(size_t size) throw ();
 
   static void
-  operator delete(void *ptr, size_t size);
+  operator delete(void *ptr, size_t size) throw ();
 
   sp_head();
 
@@ -335,7 +335,7 @@ public:
   }
 
   // Resets lex in 'thd' and keeps a copy of the old one.
-  void
+  bool
   reset_lex(THD *thd);
 
   // Restores lex in 'thd' from our copy, but keeps some status from the