diff options
author | monty@mysql.com <> | 2005-01-06 13:00:13 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-01-06 13:00:13 +0200 |
commit | d35140a851e0eccc013f18bee7dee45c4f32d774 (patch) | |
tree | ed8b3e5bd637f4d9661ed2ba57849e7e56d5178a /sql/sql_derived.cc | |
parent | 7cf8285b3f7ce0f6d85c3d747bd266697a576dbe (diff) | |
download | mariadb-git-d35140a851e0eccc013f18bee7dee45c4f32d774.tar.gz |
First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 520393f8544..bed65f90c00 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -147,7 +147,7 @@ exit: { thd->clear_error(); my_error(ER_VIEW_INVALID, MYF(0), orig_table_list->db, - orig_table_list->real_name); + orig_table_list->table_name); } } @@ -168,9 +168,9 @@ exit: delete derived_result; orig_table_list->derived_result= derived_result; orig_table_list->table= table; - orig_table_list->real_name= table->real_name; + orig_table_list->table_name= (char*) table->s->table_name; table->derived_select_number= first_select->select_number; - table->tmp_table= TMP_TABLE; + table->s->tmp_table= TMP_TABLE; #ifndef NO_EMBEDDED_ACCESS_CHECKS table->grant.privilege= SELECT_ACL; #endif |