Commit 62a11790 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/kostja/mysql/mysql-5.0-root


sql/sql_class.cc:
  Auto merged
parents 394ade63 f7f08b12
...@@ -102,7 +102,6 @@ THD::THD():user_time(0), is_fatal_error(0), ...@@ -102,7 +102,6 @@ THD::THD():user_time(0), is_fatal_error(0),
query_error= tmp_table_used= 0; query_error= tmp_table_used= 0;
next_insert_id=last_insert_id=0; next_insert_id=last_insert_id=0;
open_tables= temporary_tables= handler_tables= derived_tables= 0; open_tables= temporary_tables= handler_tables= derived_tables= 0;
handler_items=0;
tmp_table=0; tmp_table=0;
lock=locked_tables=0; lock=locked_tables=0;
used_tables=0; used_tables=0;
......
...@@ -547,7 +547,7 @@ class THD :public ilink ...@@ -547,7 +547,7 @@ class THD :public ilink
free_root(&mem_root,MYF(MY_KEEP_PREALLOC)); free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
} }
} transaction; } transaction;
Item *free_list, *handler_items; Item *free_list;
Field *dupp_field; Field *dupp_field;
#ifndef __WIN__ #ifndef __WIN__
sigset_t signals,block_signals; sigset_t signals,block_signals;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment