Manual merge

mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
This commit is contained in:
unknown 2005-09-22 02:38:14 +04:00
commit c64d0fc634
4 changed files with 27 additions and 2 deletions

View file

@ -2129,8 +2129,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
lex->result->cleanup();
lex->result->set_thd(thd);
}
DBUG_VOID_RETURN;
thd->allow_sum_func= 0;
DBUG_VOID_RETURN;
}