summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-01-27 22:35:04 +0300
committerAlexander Nozdrin <alik@sun.com>2010-01-27 22:35:04 +0300
commit32ab87c385520f718f7334d9a693c33850cfec83 (patch)
tree0978088da05e633ea116ccd85fb81903fa9214fa /sql/sql_prepare.cc
parent269822506d8f03d8527eabdbf1bce0e1a0e24513 (diff)
parent6f380d1650ad123c61640522cb5274eb143a5fa9 (diff)
downloadmariadb-git-32ab87c385520f718f7334d9a693c33850cfec83.tar.gz
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 63b7649bad5..12de2bbcecc 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1675,6 +1675,8 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
{
lex->link_first_table_back(create_table, link_to_local);
create_table->create= TRUE;
+ /* Base table and temporary table are not in the same name space. */
+ create_table->skip_temporary= true;
}
if (open_normal_and_derived_tables(stmt->thd, lex->query_tables, 0))