diff options
Diffstat (limited to 'storage/innobase/include/row0upd.ic')
| -rw-r--r-- | storage/innobase/include/row0upd.ic | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic index 10646241125..8a2543eaac9 100644 --- a/storage/innobase/include/row0upd.ic +++ b/storage/innobase/include/row0upd.ic @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -43,12 +43,12 @@ upd_create( { upd_t* update; - update = (upd_t*) mem_heap_alloc(heap, sizeof(upd_t)); + update = (upd_t*) mem_heap_zalloc(heap, sizeof(upd_t)); update->info_bits = 0; update->n_fields = n; update->fields = (upd_field_t*) - mem_heap_alloc(heap, sizeof(upd_field_t) * n); + mem_heap_zalloc(heap, sizeof(upd_field_t) * n); return(update); } @@ -102,7 +102,7 @@ upd_field_set_field_no( upd_field->field_no = field_no; upd_field->orig_len = 0; - if (UNIV_UNLIKELY(field_no >= dict_index_get_n_fields(index))) { + if (field_no >= dict_index_get_n_fields(index)) { fprintf(stderr, "InnoDB: Error: trying to access field %lu in ", (ulong) field_no); @@ -157,7 +157,7 @@ row_upd_rec_sys_fields( ut_ad(dict_index_is_clust(index)); ut_ad(rec_offs_validate(rec, index, offsets)); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { ulint pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID); page_zip_write_trx_id_and_roll_ptr(page_zip, rec, offsets, pos, trx->id, roll_ptr); |