diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-12 19:36:47 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-12 19:36:47 +0400 |
| commit | dfe66b93c8a1def2c59cb9e31468e60b2c335b72 (patch) | |
| tree | f6521c9fca04a72ee3cc875933aa5f6c07a78fdb /sql/sql_select.cc | |
| parent | 2abc977de9e0c4bbee7786ff18b3be5accf0fd4b (diff) | |
| parent | 5e84eb565250925015a8958905493241904aab75 (diff) | |
| download | mariadb-git-dfe66b93c8a1def2c59cb9e31468e60b2c335b72.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 05ee0d77c1f..63f2604a934 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1505,7 +1505,7 @@ JOIN::exec() if ((curr_join->select_lex->options & OPTION_SCHEMA_TABLE) && !thd->lex->describe && - get_schema_tables_result(curr_join)) + get_schema_tables_result(curr_join, PROCESSED_BY_JOIN_EXEC)) { DBUG_VOID_RETURN; } @@ -12372,7 +12372,7 @@ create_sort_index(THD *thd, JOIN *join, ORDER *order, /* Fill schema tables with data before filesort if it's necessary */ if ((join->select_lex->options & OPTION_SCHEMA_TABLE) && !thd->lex->describe && - get_schema_tables_result(join)) + get_schema_tables_result(join, PROCESSED_BY_CREATE_SORT_INDEX)) goto err; if (table->s->tmp_table) |