diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-27 12:50:50 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-27 12:50:50 +0100 |
| commit | e7802bff0e13fc420e3a3421f89a161618b32b0b (patch) | |
| tree | 6941b628b03be5fb5313875f05616fa9f591744c | |
| parent | 5b460c6403e7683bfc7aec8f5a87616b722f4bb2 (diff) | |
| download | mariadb-git-e7802bff0e13fc420e3a3421f89a161618b32b0b.tar.gz | |
- Fix a bug causing the connection string of a partition table not being
edited with the partition name when it was specified in the OPTION_LIST.
modified:
storage/connect/ha_connect.cc
| -rw-r--r-- | storage/connect/ha_connect.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 0a448b74830..5bc6f84a9df 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -1064,9 +1064,16 @@ char *ha_connect::GetStringOption(char *opname, char *sdef) } // endif Table_charset - if (!opval && options && options->oplist) + if (!opval && options && options->oplist) { opval= GetListOption(xp->g, opname, options->oplist); + if (opval && (!stricmp(opname, "connect") + || !stricmp(opname, "tabname") + || !stricmp(opname, "filename"))) + opval = GetRealString(opval); + + } // endif opval + if (!opval) { if (sdef && !strcmp(sdef, "*")) { // Return the handler default value |