summaryrefslogtreecommitdiff
path: root/storage/connect/tabvir.cpp
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-02-15 16:43:15 +0100
committerSergei Golubchik <serg@mariadb.org>2021-02-15 16:43:15 +0100
commit25d9d2e37f37fd3d6dfa0004a142f83c260e7ebf (patch)
treededbab65f15c43cfb4abba87f9ff5da7df47a73c /storage/connect/tabvir.cpp
parent5e3d3220bbe344b0de60b26c24fd5cdc9fe1741a (diff)
parent26965387230a9b13fb716344477d108bb87dea98 (diff)
downloadmariadb-git-25d9d2e37f37fd3d6dfa0004a142f83c260e7ebf.tar.gz
Merge branch 'bb-10.4-release' into bb-10.5-release
Diffstat (limited to 'storage/connect/tabvir.cpp')
-rw-r--r--storage/connect/tabvir.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/storage/connect/tabvir.cpp b/storage/connect/tabvir.cpp
index 76d52e198e3..2fdb7f64744 100644
--- a/storage/connect/tabvir.cpp
+++ b/storage/connect/tabvir.cpp
@@ -168,17 +168,16 @@ int TDBVIR::TestFilter(PFIL filp, bool nop)
} // endswitch op
if (!nop) switch (op) {
- case OP_LT: l1--;
- /* falls through */
- case OP_LE: limit = l1; break;
- default: ok = false;
- } // endswitch op
+ case OP_LT: l1--; /* fall through */
+ case OP_LE: limit = l1; break;
+ default: ok = false;
+ } // endswitch op
+
else switch (op) {
- case OP_GE: l1--;
- /* falls through */
- case OP_GT: limit = l1; break;
- default: ok = false;
- } // endswitch op
+ case OP_GE: l1--; /* fall through */
+ case OP_GT: limit = l1; break;
+ default: ok = false;
+ } // endswitch op
limit = MY_MIN(MY_MAX(0, limit), Size);