diff options
| author | unknown <kostja@bodhi.(none)> | 2008-05-20 11:29:16 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2008-05-20 11:29:16 +0400 |
| commit | 37b2c32d95200f91c6bd427783867e0d0d295c5c (patch) | |
| tree | aa69b884f7e82cd03745af3a77cf7d18e6236410 /sql/sp_head.cc | |
| parent | 1c12291b2f39641d283590b528dc3ce63a687928 (diff) | |
| download | mariadb-git-37b2c32d95200f91c6bd427783867e0d0d295c5c.tar.gz | |
Bug#27430 "Crash in subquery code when in PS and table DDL changed after
PREPARE": rename members, methods, classes to follow the spec
(a code review request)
sql/mysql_priv.h:
enum_metadata_type -> enum_table_ref_type
sql/sp_head.cc:
Metadata_version_observer -> Reprepare_observer
sql/sql_base.cc:
metadata -> table_ref
sql/sql_class.cc:
Replace an abstract interface with a concrete implementation.
sql/sql_class.h:
enum_metadata_type -> enum_table_ref_type
sql/sql_prepare.cc:
Move implementation of Execute_observer to sql_class.cc and
rename the class to Reprepare_observer.
Use getters instead of direct access to the members.
sql/table.h:
metadata -> table_ref
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 ab95575a965..c1576c0b8a0 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1068,7 +1068,7 @@ sp_head::execute(THD *thd) LEX *old_lex; Item_change_list old_change_list; String old_packet; - Metadata_version_observer *save_metadata_observer= thd->m_metadata_observer; + Reprepare_observer *save_reprepare_observer= thd->m_reprepare_observer; Object_creation_ctx *saved_creation_ctx; @@ -1154,7 +1154,7 @@ sp_head::execute(THD *thd) of substatements (Bug#12257, Bug#27011, Bug#32868, Bug#33000), but it's not implemented yet. */ - thd->m_metadata_observer= 0; + thd->m_reprepare_observer= 0; /* It is also more efficient to save/restore current thd->lex once when @@ -1317,7 +1317,7 @@ sp_head::execute(THD *thd) thd->derived_tables= old_derived_tables; thd->variables.sql_mode= save_sql_mode; thd->abort_on_warning= save_abort_on_warning; - thd->m_metadata_observer= save_metadata_observer; + thd->m_reprepare_observer= save_reprepare_observer; thd->stmt_arena= old_arena; state= EXECUTED; |