diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
| commit | 6ac689fb4a2aed43080b94d5c6610b1e63663e03 (patch) | |
| tree | 6d923a32bd3804ae141bd4559c52d2b112b9dd34 /sql/sql_prepare.cc | |
| parent | 07b95519dd09a73837192f5b599192270069c9ea (diff) | |
| parent | de3693a1cd292af3efd8841414da866ee2c2e1de (diff) | |
| download | mariadb-git-6ac689fb4a2aed43080b94d5c6610b1e63663e03.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 7f2ab1aeb8e..48b6886f6f2 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1474,7 +1474,7 @@ static int mysql_test_select(Prepared_statement *stmt, if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL)) goto error; - thd->used_tables= 0; // Updated by setup_fields + thd->lex->used_tables= 0; // Updated by setup_fields /* JOIN::prepare calls @@ -1646,7 +1646,7 @@ static bool select_like_stmt_test(Prepared_statement *stmt, if (specific_prepare && (*specific_prepare)(thd)) DBUG_RETURN(TRUE); - thd->used_tables= 0; // Updated by setup_fields + thd->lex->used_tables= 0; // Updated by setup_fields /* Calls JOIN::prepare */ DBUG_RETURN(lex->unit.prepare(thd, 0, setup_tables_done_option)); |