diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
| commit | efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e (patch) | |
| tree | 9eb3b78e20ecf4bd9e5cd587db50d51c1f06d336 /sql/sql_base.cc | |
| parent | a7f87effa57f6486c23bf5b340c8474a635dcf71 (diff) | |
| parent | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff) | |
| download | mariadb-git-efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 600bb641448..4616b5c2430 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4722,9 +4722,6 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) */ for (tables= *start; tables ;tables= tables->next_global) { - DBUG_PRINT("tcache", ("opening table: '%s'.'%s' item: 0x%lx", - tables->db, tables->table_name, (long) tables)); - safe_to_ignore_table= FALSE; /* @@ -4737,8 +4734,11 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) { if (tables->view) goto process_view_routines; + DBUG_PRINT("tcache", ("ignoring placeholder for derived table")); continue; } + DBUG_PRINT("tcache", ("opening table: '%s'.'%s' item: 0x%lx", + tables->db, tables->table_name, (long) tables)); /* If this TABLE_LIST object is a placeholder for an information_schema table, create a temporary table to represent the information_schema |