diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-23 17:54:53 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-23 17:54:53 +0100 |
commit | dc091a29352bf034ce699395f26a939020c9422e (patch) | |
tree | 0fd65ef8802e1ee5771c71c879b1c83cb3905764 /storage/connect/tabmysql.cpp | |
parent | e57677238379624fc4aa1ff5b2852acfad5c2372 (diff) | |
download | mariadb-git-dc091a29352bf034ce699395f26a939020c9422e.tar.gz |
- Fix MDEV-7489 (in add_field)
modified:
storage/connect/ha_connect.cc
- Fix MDEV-7494 (adding Insert_quoted in the STRING class)
modified:
storage/connect/tabmysql.cpp
storage/connect/xobject.cpp
storage/connect/xobject.h
- Fix MDEV-7498 in value.cpp (AllocateValue)
modified:
storage/connect/value.cpp
- Handle backslash in Json serialize + uchar + typo.
modified:
storage/connect/json.cpp
storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/tabmysql.cpp')
-rw-r--r-- | storage/connect/tabmysql.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 54627ba43fd..33a4dd67d38 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -1141,19 +1141,16 @@ int TDBMYSQL::WriteDB(PGLOBAL g) int rc; uint len = Query->GetLength(); char buf[64]; - bool b, oom = false; + bool oom = false; // Make the Insert command value list for (PCOL colp = Columns; colp; colp = colp->GetNext()) { if (!colp->GetValue()->IsNull()) { - if ((b = colp->GetResultType() == TYPE_STRING || - colp->GetResultType() == TYPE_DATE)) - oom |= Query->Append('\''); - - oom |= Query->Append(colp->GetValue()->GetCharString(buf)); - - if (b) - oom |= Query->Append('\''); + if (colp->GetResultType() == TYPE_STRING || + colp->GetResultType() == TYPE_DATE) + oom |= Query->Append_quoted(colp->GetValue()->GetCharString(buf)); + else + oom |= Query->Append(colp->GetValue()->GetCharString(buf)); } else oom |= Query->Append("NULL"); |