diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
| commit | fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf (patch) | |
| tree | 0c7d096327ae1ce637c2042f7daee1589cf36e90 /sql/rpl_gtid.cc | |
| parent | 6feb74c4b21143ece69bcc1e04474a528f122cdb (diff) | |
| parent | 6d49ef49e57708b4bbc6b428c9e6228685e59452 (diff) | |
| download | mariadb-git-fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 6d6211e4741..9f48f908102 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -2139,10 +2139,7 @@ slave_connection_state::load(const char *slave_request, size_t len) for (;;) { if (!(rec= (uchar *)my_malloc(sizeof(entry), MYF(MY_WME)))) - { - my_error(ER_OUTOFMEMORY, MYF(0), (int) sizeof(*gtid)); return 1; - } gtid= &((entry *)rec)->gtid; if (gtid_parser_helper(&p, end, gtid)) { @@ -2758,10 +2755,7 @@ gtid_waiting::get_entry(uint32 domain_id) return e; if (!(e= (hash_element *)my_malloc(sizeof(*e), MYF(MY_WME)))) - { - my_error(ER_OUTOFMEMORY, MYF(0), (int) sizeof(*e)); return NULL; - } if (init_queue(&e->queue, 8, offsetof(queue_element, wait_seq_no), 0, cmp_queue_elem, NULL, 1+offsetof(queue_element, queue_idx), 1)) |