diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-04-01 11:45:27 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-04-01 11:45:27 +0200 |
commit | d805690564bcfed6da0ce1d7dde3b7071fecdda6 (patch) | |
tree | 633e77db0f9461e133ccac0c9bc2aa02283cdc6c /storage/connect/tabvct.cpp | |
parent | 879be566e084e493415b362e40f616f6b3731f52 (diff) | |
download | mariadb-git-d805690564bcfed6da0ce1d7dde3b7071fecdda6.tar.gz |
- Fix bugs with VEC tables header and empty file making for HUGE tables.
Adding tests of MAPPED and HUGE tables in upd.test
modified:
mysql-test/suite/connect/r/upd.result
mysql-test/suite/connect/t/upd.test
storage/connect/filamvct.cpp
storage/connect/tabvct.cpp
Diffstat (limited to 'storage/connect/tabvct.cpp')
-rw-r--r-- | storage/connect/tabvct.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/connect/tabvct.cpp b/storage/connect/tabvct.cpp index 068ac7190f8..234b9707706 100644 --- a/storage/connect/tabvct.cpp +++ b/storage/connect/tabvct.cpp @@ -99,8 +99,12 @@ bool VCTDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) Header = Cat->GetIntCatInfo("Header", 0); // CONNECT must have Block/Last info for VEC tables - if (Estimate && !Split && !Header) - Header = 2; + if (Estimate && !Split && !Header) { + char *fn = Cat->GetStringCatInfo(g, "Filename", "?"); + + // No separate header file fo urbi tables + Header = (*fn == '?') ? 3 : 2; + } // endif Estimate Recfm = RECFM_VCT; |