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/mysql_priv.h | |
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/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index cbfc4ad8090..0060e7873e1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -700,14 +700,14 @@ const char *set_thd_proc_info(THD *thd, const char *info, @sa Prepared_statement::reprepare() */ -enum enum_metadata_type +enum enum_table_ref_type { /** Initial value set by the parser */ - METADATA_NULL= 0, - METADATA_VIEW, - METADATA_BASE_TABLE, - METADATA_I_S_TABLE, - METADATA_TMP_TABLE + TABLE_REF_NULL= 0, + TABLE_REF_VIEW, + TABLE_REF_BASE_TABLE, + TABLE_REF_I_S_TABLE, + TABLE_REF_TMP_TABLE }; /* |