diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:32:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:38:34 +0200 |
| commit | cb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch) | |
| tree | 29d130592e3dfea50251771979fbaa6923d44ba9 /storage/connect/filter.cpp | |
| parent | a4885dde4ccec68bbb0268796f62e68e08ba4837 (diff) | |
| parent | 48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff) | |
| download | mariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/connect/filter.cpp')
| -rw-r--r-- | storage/connect/filter.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/connect/filter.cpp b/storage/connect/filter.cpp index 1ca482ca269..bb3be629ea4 100644 --- a/storage/connect/filter.cpp +++ b/storage/connect/filter.cpp @@ -87,7 +87,7 @@ BYTE OpBmp(PGLOBAL g, OPVAL opc) case OP_EXIST: bt = 0x00; break; default: sprintf(g->Message, MSG(BAD_FILTER_OP), opc); - throw (int)TYPE_ARRAY; + throw (int)TYPE_FILTER; } // endswitch opc return bt; @@ -1790,7 +1790,7 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having) break; // Remove eventual ending separator(s) // if (fp->Convert(g, having)) -// (int)throw TYPE_ARRAY; +// throw (int)TYPE_FILTER; filp = fp; fp = fp->Next; @@ -1799,8 +1799,6 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having) if (trace) htrc(" returning filp=%p\n", filp); -//if (filp) -// filp->Print(g, debug, 0); return filp; } // end of PrepareFilter |