diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
commit | 7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50 (patch) | |
tree | e9b49bfe9d96ae52a387f8370d74191bcc8cff99 /storage/connect/value.cpp | |
parent | 703ce16a114c6bc4665f596f7331d1a1f33da94f (diff) | |
download | mariadb-git-7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50.tar.gz |
- Update version number
modified: storage/connect/ha_connect.cc
- Regard columns with binary charset as string (was binary)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabutil.cpp
- Support length 0 for CHAR and VARCHAR
modified: storage/connect/ha_connect.cc
modified: storage/connect/reldef.cpp
modified: storage/connect/value.cpp
- Add ACCEPT option for void columns in discovery
modified: storage/connect/tabjson.cpp
- Update some tests because of above change
modified: storage/connect/mysql-test/connect/r/json_java_2.result
modified: storage/connect/mysql-test/connect/r/json_java_3.result
modified: storage/connect/mysql-test/connect/r/json_mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_java_2.result
modified: storage/connect/mysql-test/connect/r/mongo_java_3.result
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/mysql-test/connect/r/updelx.result
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
Diffstat (limited to 'storage/connect/value.cpp')
-rw-r--r-- | storage/connect/value.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp index 51c422389ca..f08d18b5421 100644 --- a/storage/connect/value.cpp +++ b/storage/connect/value.cpp @@ -176,7 +176,7 @@ int GetTypeSize(int type, int len) case TYPE_DOUBLE: len = sizeof(double); break; case TYPE_TINY: len = sizeof(char); break; case TYPE_PCHAR: len = sizeof(char*); break; - default: len = 0; + default: len = -1; } // endswitch type return len; @@ -1370,7 +1370,7 @@ bool TYPVAL<PSZ>::SetValue_char(const char *cp, int n) if (!cp || n == 0) { Reset(); - Null = Nullable; + Null = (cp) ? false : Nullable; } else if (cp != Strp) { const char *p = cp + n - 1; |