diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-11-20 15:30:35 +0200 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-20 15:30:35 +0200 |
commit | 3a76c32c05697862732664d0803478e1b11dfa9f (patch) | |
tree | 6988dc0c6afc60b486352d2d210b8b06367312e1 /sql/log.h | |
parent | 20e7e3a6b92f4702ef4798ad8feaf4c917f9877f (diff) | |
download | mariadb-git-3a76c32c05697862732664d0803478e1b11dfa9f.tar.gz |
Bug #48463 backporting from 6.0-rpl to celosia a set of bugs
The mentioned on the bug report set of bugs fixes have not be pushed to the main trees.
Fixed with extracting commits done to 6.0-rpl tree and applying them to the main 5.1.
Notes.
1. part of changes - the mtr's specific - were packported to the main 5.0 tree for mtr v1
as http://lists.mysql.com/commits/46562
However, there is no that fix anymore in the mtr v2. (This fact was mailed to mtr maintaining
people).
2. Bug@36929 crash in kill_zombie_dump_threads-> THD::awake() with replication tests
is not backported because the base code of the patch is libevent and that was removed
from the main trees due to its instability.
Diffstat (limited to 'sql/log.h')
-rw-r--r-- | sql/log.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h index a31be6dcce6..7f4e6e93266 100644 --- a/sql/log.h +++ b/sql/log.h @@ -611,5 +611,6 @@ enum enum_binlog_format { extern TYPELIB binlog_format_typelib; int query_error_code(THD *thd, bool not_killed); +uint purge_log_get_error_code(int res); #endif /* LOG_H */ |