diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-25 22:44:42 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-25 22:44:42 +0100 |
commit | edd161587eeb296563622309c5809d4f4e68fb67 (patch) | |
tree | 028937c545916848ac040c4e7d05064b6b803070 /storage/connect/table.cpp | |
parent | 2b60525d57e30e668cfe97a8d7d3327577663c79 (diff) | |
download | mariadb-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/table.cpp')
-rw-r--r-- | storage/connect/table.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/table.cpp b/storage/connect/table.cpp index 84eb40144cc..3768109809e 100644 --- a/storage/connect/table.cpp +++ b/storage/connect/table.cpp @@ -530,7 +530,7 @@ bool TDBCAT::InitCol(PGLOBAL g) for (colp = (PCATCOL)Columns; colp; colp = (PCATCOL)colp->GetNext()) { for (crp = Qrp->Colresp; crp; crp = crp->Next) - if ((colp->Flag == crp->Ncol) || + if ((colp->Flag && colp->Flag == crp->Fld) || (!colp->Flag && !stricmp(colp->Name, crp->Name))) { colp->Crp = crp; break; |