summaryrefslogtreecommitdiff
path: root/storage/connect/colblk.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/colblk.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/colblk.cpp')
-rw-r--r--storage/connect/colblk.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/colblk.cpp b/storage/connect/colblk.cpp
index 5690062be47..44383d584a8 100644
--- a/storage/connect/colblk.cpp
+++ b/storage/connect/colblk.cpp
@@ -79,8 +79,7 @@ COLBLK::COLBLK(PCOL col1, PTDB tdbp)
if (trace(2))
htrc(" copying COLBLK %s from %p to %p\n", Name, col1, this);
- if (tdbp)
- {
+ if (tdbp) {
// Attach the new column to the table block
if (!tdbp->GetColumns()) {
tdbp->SetColumns(this);