summaryrefslogtreecommitdiff
path: root/storage/connect/colblk.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-02-25 22:44:42 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2013-02-25 22:44:42 +0100
commitedd161587eeb296563622309c5809d4f4e68fb67 (patch)
tree028937c545916848ac040c4e7d05064b6b803070 /storage/connect/colblk.cpp
parent2b60525d57e30e668cfe97a8d7d3327577663c79 (diff)
downloadmariadb-git-edd161587eeb296563622309c5809d4f4e68fb67.tar.gz
- Catalog table: Use XFLD as Flag value instead of column index.
- Use the COLDEF flag to initialize column nullable value. - Fix a bug on inserting null values in MYSQL tables. modified: storage/connect/colblk.cpp storage/connect/connect.cc storage/connect/ha_connect.cc storage/connect/odbconn.cpp storage/connect/plgdbsem.h storage/connect/table.cpp storage/connect/tabmysql.cpp
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 027ac5710ab..cdbf6f4b42b 100644
--- a/storage/connect/colblk.cpp
+++ b/storage/connect/colblk.cpp
@@ -40,16 +40,17 @@ COLBLK::COLBLK(PCOLDEF cdp, PTDB tdbp, int i)
Long = cdp->Long;
Buf_Type = cdp->Buf_Type;
ColUse |= cdp->Flags; // Used by CONNECT
+ Nullable = !!(cdp->Flags & U_NULLS);
} else {
Name = NULL;
memset(&Format, 0, sizeof(FORMAT));
Opt = 0;
Long = 0;
Buf_Type = TYPE_ERROR;
+ Nullable = false;
} // endif cdp
To_Tdb = tdbp;
- Nullable = false;
Status = BUF_NO;
//Value = NULL; done in XOBJECT constructor
To_Kcol = NULL;