diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 14:49:07 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 14:49:07 +0200 |
| commit | 1b921a995e3defb62aa51fc09fc4eaed9b0f4eab (patch) | |
| tree | 2296c7002f19725e5df14900abb3708b44f792fc /sql/sql_derived.cc | |
| parent | 802705f957011aebbb03ca988080f914bf39a57e (diff) | |
| download | mariadb-git-1b921a995e3defb62aa51fc09fc4eaed9b0f4eab.tar.gz | |
many bug fixes
mysql-test/r/derived.result:
test for a bug fix which caused a deadlock !
Also test for a bug fix with using() on derived tables
mysql-test/r/subselect.result:
correcting previous changes caused by a bug ..
mysql-test/t/derived.test:
test for a bug fix which caused a deadlock !
Also test for a bug fix with using() on derived tables
mysql-test/t/subselect.test:
corrections of previous changes caused by a bug ..
sql/sql_base.cc:
A for for a bug which caused a deadlock !
Also fix for a bug with using() on derived tables
sql/sql_derived.cc:
code cleanup
sql/sql_lex.cc:
fix for deadlock
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 01e2c1a98d8..2176740e67b 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -106,9 +106,9 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t) t->table=table; table->derived_select_number= sl->select_number; table->tmp_table=TMP_TABLE; - if (!lex->describe) + if (lex->describe) sl->exclude(); - t->db=(tables && tables->db) ? tables->db : (char *)""; + t->db=(char *)""; t->derived=(SELECT_LEX *)0; // just in case ... } } |