diff options
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index d0d4f92ae67..01a4cb73704 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -129,16 +129,7 @@ public: Creates temporary sp_name object from key, used mainly for SP-cache lookups. */ - sp_name(char *key, uint key_len) - { - m_sroutines_key.str= key; - m_sroutines_key.length= key_len; - m_name.str= m_qname.str= key + 1; - m_name.length= m_qname.length= key_len - 1; - m_db.str= 0; - m_db.length= 0; - m_explicit_name= false; - } + sp_name(THD *thd, char *key, uint key_len); // Init. the qualified name from the db and name. void init_qname(THD *thd); // thd for memroot allocation @@ -269,10 +260,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(); @@ -339,7 +330,7 @@ public: @todo Conflicting comment in sp_head.cc */ - void + bool reset_lex(THD *thd); /** |