summaryrefslogtreecommitdiff
path: root/storage/connect/tabtbl.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-04-10 23:38:27 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-04-10 23:38:27 +0200
commit1357bffbf39cdeb1746ce276ad3a556ec0356c35 (patch)
tree02f6679fa1ba009e9911f76c49124ffd3faf6a91 /storage/connect/tabtbl.cpp
parent9b790248c5c1f4d8ef006ef2b7383aa41986c1a6 (diff)
downloadmariadb-git-1357bffbf39cdeb1746ce276ad3a556ec0356c35.tar.gz
- Add support of NULLs for file table columns.
Update CONNECT version number and date. modified: mysql-test/suite/connect/r/null.result mysql-test/suite/connect/r/xml.result mysql-test/suite/connect/t/null.test storage/connect/ha_connect.cc storage/connect/mycat.cc storage/connect/tabdos.cpp storage/connect/tabfix.cpp storage/connect/tabfmt.cpp storage/connect/tabtbl.cpp storage/connect/tabvct.cpp
Diffstat (limited to 'storage/connect/tabtbl.cpp')
-rw-r--r--storage/connect/tabtbl.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp
index b79858203da..928b72a0f9e 100644
--- a/storage/connect/tabtbl.cpp
+++ b/storage/connect/tabtbl.cpp
@@ -759,6 +759,11 @@ void TBLCOL::ReadColumn(PGLOBAL g)
if (Colp) {
Colp->ReadColumn(g);
Value->SetValue_pval(To_Val);
+
+ // Set null when applicable
+ if (Colp->IsNullable())
+ Value->SetNull(Value->IsZero());
+
} // endif Colp
} // end of ReadColumn
@@ -774,6 +779,7 @@ void TBTBLK::ReadColumn(PGLOBAL g)
htrc("TBT ReadColumn: name=%s\n", Name);
Value->SetValue_psz((char*)((PTDBTBL)To_Tdb)->Tdbp->GetName());
+
} // end of ReadColumn
/* ------------------------------------------------------------------- */