mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 19:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge rurik.mysql.com:/home/igor/mysql-5.0

Browse source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/mysql_priv.h:
  Manual merge
This commit is contained in:
unknown 2005-11-13 17:56:20 -08:00
commit 2c748c3ef9
25 changed files with 772 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_prepare.cc
View file

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