diff options
| author | serg@sergbook.mysql.com <> | 2005-01-06 17:53:32 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2005-01-06 17:53:32 +0200 |
| commit | 15133e70ac963d1e45342b8b6dea841d3855cd7e (patch) | |
| tree | d798289c2425b5d8a019f88d25f90acacb2fb289 /sql/sql_derived.cc | |
| parent | 0bea4c61051b63fb7cf3686364b509cc211c03ae (diff) | |
| parent | 0035397cb83fbf5c4f4dcb0b5daacdb5e4f857e9 (diff) | |
| download | mariadb-git-15133e70ac963d1e45342b8b6dea841d3855cd7e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
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 |