diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/log.cc | |
| parent | ca2b08e437d4c5538b40aa61fa44f68ddd74bc42 (diff) | |
| parent | 92630be0ee81604ec47cb8c7e9ab016e5449dc4d (diff) | |
| download | mariadb-git-2c6015e8dc962bef8f353af920581d9b6bd7fd82.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index e1f98ffa1bf..31276f30868 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -5789,9 +5789,8 @@ int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle) Xid_log_event *xev=(Xid_log_event *)ev; uchar *x= (uchar *) memdup_root(&mem_root, (uchar*) &xev->xid, sizeof(xev->xid)); - if (! x) + if (!x || my_hash_insert(&xids, x)) goto err2; - my_hash_insert(&xids, x); } delete ev; } |