summaryrefslogtreecommitdiff
path: root/storage/connect/colblk.cpp
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-02-07 08:51:20 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-02-07 08:51:20 +0200
commit8b6cfda631253c805687d94f2f1aaa17fd2ef0e2 (patch)
tree9460953eeb7967bc56383bccc8c7af2adf81a694 /storage/connect/colblk.cpp
parent8b97eba31ba3b8af6a93b4836b14d52e1c377900 (diff)
parentc1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff)
downloadmariadb-git-8b6cfda631253c805687d94f2f1aaa17fd2ef0e2.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'storage/connect/colblk.cpp')
-rw-r--r--storage/connect/colblk.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/colblk.cpp b/storage/connect/colblk.cpp
index 44383d584a8..5690062be47 100644
--- a/storage/connect/colblk.cpp
+++ b/storage/connect/colblk.cpp
@@ -79,7 +79,8 @@ 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);