diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 15:07:32 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 15:13:53 +0300 |
| commit | 5b9c32ede096e19d751537c6421563a7fb71c0db (patch) | |
| tree | bde97f7b7a37ae77ee42203c9e77b080317cbb57 /storage/connect/tabmysql.cpp | |
| parent | 22c322c649d5a15e3bb731d6751a0d80c8ec23b0 (diff) | |
| parent | bf34e9db7be5baf64d131ce7c793be77172e4ed2 (diff) | |
| download | mariadb-git-bb-10.2-vicentiu2.tar.gz | |
Merge remote-tracking branch 'connect/10.2' into 10.2bb-10.2-vicentiu2
Diffstat (limited to 'storage/connect/tabmysql.cpp')
| -rw-r--r-- | storage/connect/tabmysql.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index bdddcf64ca8..d1e2ae69608 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -513,18 +513,8 @@ bool TDBMYSQL::MakeSelect(PGLOBAL g, bool mx) if (Query) return false; // already done - if (Srcdef) { - if (strstr(Srcdef, "%s")) { - char *fil; - - fil = (To_CondFil) ? To_CondFil->Body : PlugDup(g, "1=1"); - Query = new(g)STRING(g, strlen(Srcdef) + strlen(fil)); - Query->SetLength(sprintf(Query->GetStr(), Srcdef, fil)); - } else - Query = new(g)STRING(g, 0, Srcdef); - - return false; - } // endif Srcdef + if (Srcdef) + return MakeSrcdef(g); // Allocate the string used to contain Query Query = new(g) STRING(g, 1023, "SELECT "); @@ -1270,7 +1260,8 @@ MYSQLCOL::MYSQLCOL(MYSQL_FIELD *fld, PTDB tdbp, int i, PCSZ am) : COLBLK(NULL, tdbp, i) { const char *chset = get_charset_name(fld->charsetnr); - char v = (!strcmp(chset, "binary")) ? 'B' : 0; +//char v = (!strcmp(chset, "binary")) ? 'B' : 0; + char v = 0; Name = fld->name; Opt = 0; |