diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-02-15 23:41:59 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-02-15 23:41:59 +0100 |
| commit | 481e6433f4da5bf283a1f75391abc522c1790eff (patch) | |
| tree | e99c2167e5293b037bc18c2d80c046bf9de9f2a8 /storage/connect/valblk.h | |
| parent | 62a5e56c01f120d2be6a837c8b9bd76950d6ef4e (diff) | |
| download | mariadb-git-481e6433f4da5bf283a1f75391abc522c1790eff.tar.gz | |
- Fix to MDEV-9542 Connect was not handling NULLs in the answer
from catalog functions and tables. It does now and when decimal
is NULL defines DOUBLE without parameters.
modified: storage/connect/ha_connect.cc
modified: storage/connect/mysql-test/connect/r/odbc.result
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/mysql-test/connect/r/odbc_postgresql.result
modified: storage/connect/mysql-test/connect/r/odbc_sqlite3.result
modified: storage/connect/mysql-test/connect/r/odbc_xls.result
modified: storage/connect/odbconn.cpp
modified: storage/connect/table.cpp
modified: storage/connect/valblk.h
Diffstat (limited to 'storage/connect/valblk.h')
| -rw-r--r-- | storage/connect/valblk.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h index f6eb7258a77..c3cad79b234 100644 --- a/storage/connect/valblk.h +++ b/storage/connect/valblk.h @@ -73,7 +73,8 @@ class VALBLK : public BLOCK { virtual void SetNull(int n, bool b) {if (To_Nulls) {To_Nulls[n] = (b) ? '*' : 0;}} virtual bool IsNull(int n) {return To_Nulls && To_Nulls[n];} - virtual void SetNullable(bool b); + virtual bool IsNullable(void) {return Nullable;} + virtual void SetNullable(bool b); virtual bool IsUnsigned(void) {return Unsigned;} virtual bool Init(PGLOBAL g, bool check) = 0; virtual int GetVlen(void) = 0; |