diff options
| author | unknown <kostja@bodhi.(none)> | 2007-10-20 01:21:20 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-10-20 01:21:20 +0400 |
| commit | c33823ba83639465595cce44754dcdfad66aecfd (patch) | |
| tree | a74973518648377170d396cc6b829e384f3f28e5 /sql/sql_class.cc | |
| parent | 66cd6d0c8f24825a688f8dd8d091c7a50d72fbb5 (diff) | |
| parent | 079ae230032ee2c8aadcce9f70c1f3d686a13da8 (diff) | |
| download | mariadb-git-c33823ba83639465595cce44754dcdfad66aecfd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d3ebfd94aa7..d77e531ec13 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -395,7 +395,7 @@ THD::THD() count_cuted_fields= CHECK_FIELD_IGNORE; killed= NOT_KILLED; col_access=0; - query_error= thread_specific_used= FALSE; + is_slave_error= thread_specific_used= FALSE; hash_clear(&handler_tables_hash); tmp_table=0; used_tables=0; |