diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
| commit | 70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f (patch) | |
| tree | 5eea378d9752f55471ea2bc35f83ad5675471485 /storage/xtradb/row | |
| parent | c59a52b7bad473a162a51000f2a24507c83b5fc8 (diff) | |
| parent | 7008d4616421fdf73d109ed297def27fa4679da4 (diff) | |
| download | mariadb-git-70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/row')
| -rw-r--r-- | storage/xtradb/row/row0sel.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc index 8e3ed3d1a4e..26fd7629a5d 100644 --- a/storage/xtradb/row/row0sel.cc +++ b/storage/xtradb/row/row0sel.cc @@ -1545,6 +1545,7 @@ rec_loop: switch (err) { case DB_SUCCESS_LOCKED_REC: err = DB_SUCCESS; + /* fall through */ case DB_SUCCESS: break; default: @@ -1603,6 +1604,7 @@ skip_lock: switch (err) { case DB_SUCCESS_LOCKED_REC: err = DB_SUCCESS; + /* fall through */ case DB_SUCCESS: break; default: @@ -4186,6 +4188,7 @@ wait_table_again: switch (err) { case DB_SUCCESS_LOCKED_REC: err = DB_SUCCESS; + /* fall through */ case DB_SUCCESS: break; default: @@ -4281,6 +4284,7 @@ rec_loop: switch (err) { case DB_SUCCESS_LOCKED_REC: err = DB_SUCCESS; + /* fall through */ case DB_SUCCESS: break; default: @@ -4323,8 +4327,7 @@ wrong_offs: if ((srv_force_recovery == 0 || moves_up == FALSE) && srv_pass_corrupt_table <= 1) { ut_print_timestamp(stderr); - buf_page_print(page_align(rec), 0, - BUF_PAGE_PRINT_NO_CRASH); + buf_page_print(page_align(rec), 0); fprintf(stderr, "\nInnoDB: rec address %p," " buf block fix count %lu\n", @@ -4569,6 +4572,7 @@ no_gap_lock: prebuilt->new_rec_locks = 1; } err = DB_SUCCESS; + /* fall through */ case DB_SUCCESS: break; case DB_LOCK_WAIT: |