diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-24 17:41:34 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-24 17:41:34 +0200 |
| commit | 83e25bbc3090982c31a064b1b2cd78b710c37207 (patch) | |
| tree | 80c31753814c2a84f21ef0eda97bf9e563dac4a5 /sql/sql_base.cc | |
| parent | 4587dddab92fc96764f190b8dc1d74461846f47d (diff) | |
| download | mariadb-git-83e25bbc3090982c31a064b1b2cd78b710c37207.tar.gz | |
fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
renamed tables to prevent droping real tables
mysql-test/r/group_by.result:
test of error message
mysql-test/r/subselect.result:
renamed tables to prevent droping real tables
mysql-test/t/group_by.test:
test of error message
mysql-test/t/subselect.test:
renamed tables to prevent droping real tables
sql/sql_base.cc:
moved thd->allow_sum_func assignment to upper level
sql/sql_select.cc:
fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 7b434eb0bfb..d105d44fe12 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2227,8 +2227,6 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) thd->set_query_id=1; thd->cond_count= 0; - bool save_allow_sum_func= thd->allow_sum_func; - thd->allow_sum_func= 0; if (*conds) { thd->where="where clause"; @@ -2301,7 +2299,6 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) table->on_expr=and_conds(table->on_expr,cond_and); } } - thd->allow_sum_func= save_allow_sum_func; DBUG_RETURN(test(thd->fatal_error)); } |