diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-11 14:21:38 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-11 14:21:38 +0200 |
| commit | af9e6182899409df3199d5c577d04d1b09fe79d8 (patch) | |
| tree | b2297db0b5195976bd52a9255fbd72a2bf4f8dcf /storage/connect/tabutil.cpp | |
| parent | 8bd158c10d468eabd699d881e7cea75320a37d72 (diff) | |
| download | mariadb-git-af9e6182899409df3199d5c577d04d1b09fe79d8.tar.gz | |
- Fix MDEV-4881. SQL_TYPE_DECIMAL was not recognized in ha_connect::GetColumnOption.
Crash on second SELECT was because tshp was not reset to NULL in case of error.
modified:
storage/connect/ha_connect.cc
storage/connect/tabutil.cpp
Diffstat (limited to 'storage/connect/tabutil.cpp')
| -rw-r--r-- | storage/connect/tabutil.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp index 93b8e7a4263..151b527507a 100644 --- a/storage/connect/tabutil.cpp +++ b/storage/connect/tabutil.cpp @@ -368,7 +368,11 @@ PTDBASE TDBPRX::GetSubTable(PGLOBAL g, PTABLE tabp, bool b) #if defined(MYSQL_SUPPORT) // Access sub-table via MySQL API if (!(tdbp= cat->GetTable(g, tabp, MODE_READ, "MYPRX"))) { - sprintf(g->Message, "Cannot access %s.%s", db, name); + char buf[MAX_STR]; + + strcpy(buf, g->Message); + sprintf(g->Message, "Error accessing %s.%s: %s", db, name, buf); + hc->tshp = NULL; goto err; } // endif Define |