database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

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


sql/sql_class.cc:
  Auto merged
This commit is contained in:
unknown
2003-11-21 17:23:24 +03:00
parent 394ade6306 f7f08b1237
commit 62a1179014
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.cc
View File

@@ -102,7 +102,6 @@ THD::THD():user_time(0), is_fatal_error(0),
query_error= tmp_table_used= 0;
next_insert_id=last_insert_id=0;
open_tables= temporary_tables= handler_tables= derived_tables= 0;
handler_items=0;
tmp_table=0;
lock=locked_tables=0;
used_tables=0;

2
sql/sql_class.h
View File

@@ -547,7 +547,7 @@ public:
free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
}
} transaction;
Item *free_list, *handler_items;
Item *free_list;
Field *dupp_field;
#ifndef __WIN__
sigset_t signals,block_signals;