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

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/engines/funcs/t/disabled.def
  - mysql-test/suite/engines/iuds/t/disabled.def
  - mysql-test/suite/engines/iuds/t/insert_number.test
This commit is contained in:
Alexander Nozdrin
2010-05-07 13:37:16 +04:00
parent 72ae25b11e 19fac19a93
commit fe8f7052fc
222 changed files with 5498 additions and 5233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -505,7 +505,7 @@ THD::THD()
count_cuted_fields= CHECK_FIELD_IGNORE;
killed= NOT_KILLED;
col_access=0;
is_slave_error= thread_specific_used= FALSE;
is_slave_error= thread_specific_used= thread_temporary_used= FALSE;
my_hash_clear(&handler_tables_hash);
tmp_table=0;
used_tables=0;