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 of local mysql-trunk-merge with bk-internal.

Browse Source 
Conflicts:

Text conflict in sql/CMakeLists.txt
This commit is contained in:
Alexey Kopytov
2010-05-07 18:56:46 +04:00
parent 940ad61b71 2a95927fa7
commit 480a4852a0
222 changed files with 5500 additions and 5235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -536,7 +536,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;