database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt

Browse Source 
into  linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/union.result:
  Bug#32858: Manual merge
mysql-test/t/union.test:
  Bug#32858: Manual merge
This commit is contained in:
unknown
2007-12-15 12:07:33 +01:00
parent d8babe1ae2 93e3057ba5
commit 30b17b997f
5 changed files with 150 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.cc
View File

@ -931,6 +931,7 @@ void THD::rollback_item_tree_changes()
select_result::select_result()
{
thd=current_thd;
nest_level= -1;
}
void select_result::send_error(uint errcode,const char *err)