summaryrefslogtreecommitdiff
path: root/storage/connect/reldef.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2016-09-16 22:14:14 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2016-09-16 22:14:14 +0200
commit7d596c9ff526bc912769490023c44e9a5b2fa743 (patch)
tree12edec16848c2065375e7c832f751ecba317328d /storage/connect/reldef.cpp
parent2140dcf66d7f430cbaba0cc47fe8d382574cc375 (diff)
downloadmariadb-git-7d596c9ff526bc912769490023c44e9a5b2fa743.tar.gz
- Working on MDEV-10525. Lrecl mismatch on DBF files
modified: storage/connect/filamdbf.cpp modified: storage/connect/filamdbf.h modified: storage/connect/reldef.cpp
Diffstat (limited to 'storage/connect/reldef.cpp')
-rw-r--r--storage/connect/reldef.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp
index 8ad6e203d51..ac2327212e0 100644
--- a/storage/connect/reldef.cpp
+++ b/storage/connect/reldef.cpp
@@ -440,7 +440,11 @@ int TABDEF::GetColCatInfo(PGLOBAL g)
} // endswitch tc
// lrecl must be at least recln to avoid buffer overflow
- recln= MY_MAX(recln, Hc->GetIntegerOption("Lrecl"));
+ if (trace)
+ htrc("Lrecl: Calculated=%d defined=%d\n",
+ recln, Hc->GetIntegerOption("Lrecl"));
+
+ recln = MY_MAX(recln, Hc->GetIntegerOption("Lrecl"));
Hc->SetIntegerOption("Lrecl", recln);
((PDOSDEF)this)->SetLrecl(recln);
} // endif Lrecl