diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2019-04-25 20:11:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 20:11:37 +0900 |
| commit | 80e8fee90732c4cf2436dde5d02f4edc7824f06b (patch) | |
| tree | 7d9d5df2ca140335905c6e8e2e24fb28e90a7d63 /storage/connect/tabext.cpp | |
| parent | ebf3376677f9803a914cadc034c71ec2881f9eb4 (diff) | |
| parent | ca7fbcea6c4fe13c295cf43b80d05351aba59e95 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-18995.tar.gz | |
Merge branch '10.4' into bb-10.4-MDEV-18995bb-10.4-MDEV-18995
Diffstat (limited to 'storage/connect/tabext.cpp')
| -rw-r--r-- | storage/connect/tabext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/tabext.cpp b/storage/connect/tabext.cpp index e9c7b2490d8..aaf14f123c6 100644 --- a/storage/connect/tabext.cpp +++ b/storage/connect/tabext.cpp @@ -342,7 +342,6 @@ bool TDBEXT::MakeSQL(PGLOBAL g, bool cnt) char *catp = NULL, buf[NAM_LEN * 3]; int len; bool first = true; - PTABLE tablep = To_Table; PCOL colp; if (Srcdef) @@ -455,6 +454,7 @@ void TDBEXT::RemoveConst(PGLOBAL g, char *stmt) int n, nc; while ((p = strstr(stmt, "NAME_CONST"))) + { if ((n = sscanf(p, "%*[^,],%1024[^)])%n", val, &nc))) { if (trace(33)) htrc("p=%s\nn=%d val=%s nc=%d\n", p, n, val, nc); @@ -478,8 +478,8 @@ void TDBEXT::RemoveConst(PGLOBAL g, char *stmt) } else break; - - return; + } + return; } // end of RemoveConst /***********************************************************************/ |