summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc6
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