diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:39:03 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:39:03 +0400 |
| commit | 051e2e4b212d0642f3e4314b842b05007b0f75a1 (patch) | |
| tree | a4d25546a4757fbba46fd255226321f24b48efa5 /storage | |
| parent | 1a9d1bf94a287f34160ec0c0338a8cbcf0265b75 (diff) | |
| download | mariadb-git-051e2e4b212d0642f3e4314b842b05007b0f75a1.tar.gz | |
Applying InnoDB snapshot
Detailed revision comments:
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/rem/rem0rec.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/storage/innodb_plugin/rem/rem0rec.c b/storage/innodb_plugin/rem/rem0rec.c index 1c8b3fd8c1e..b2a8f45f89b 100644 --- a/storage/innodb_plugin/rem/rem0rec.c +++ b/storage/innodb_plugin/rem/rem0rec.c @@ -695,19 +695,9 @@ rec_get_nth_field_offs_old( ulint os; ulint next_os; - ut_ad(rec && len); - ut_ad(n < rec_get_n_fields_old(rec)); - - if (UNIV_UNLIKELY(n > REC_MAX_N_FIELDS)) { - fprintf(stderr, "Error: trying to access field %lu in rec\n", - (ulong) n); - ut_error; - } - - if (UNIV_UNLIKELY(rec == NULL)) { - fputs("Error: rec is NULL pointer\n", stderr); - ut_error; - } + ut_ad(len); + ut_a(rec); + ut_a(n < rec_get_n_fields_old(rec)); if (rec_get_1byte_offs_flag(rec)) { os = rec_1_get_field_start_offs(rec, n); |