diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-09-05 13:18:04 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-09-05 13:18:04 +0200 |
| commit | 213765cc222139c05c27774e0555cabeff7c3bbd (patch) | |
| tree | da1e5de4e3cfd34cc081a9f9dfc7a4f53922b284 /storage/connect/reldef.cpp | |
| parent | a2934d2710d24c20ec205007bdad2495a492ad83 (diff) | |
| download | mariadb-git-213765cc222139c05c27774e0555cabeff7c3bbd.tar.gz | |
- Fix MDEV-10496. Memory leak in discovery
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Fix wrong lrecl calculation for virtual columns
modified: storage/connect/reldef.cpp
- Typo
modified: storage/connect/jdbconn.cpp
modified: storage/connect/json.cpp
Diffstat (limited to 'storage/connect/reldef.cpp')
| -rw-r--r-- | storage/connect/reldef.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp index 2c8ada52e6f..8ad6e203d51 100644 --- a/storage/connect/reldef.cpp +++ b/storage/connect/reldef.cpp @@ -294,7 +294,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g) nlg+= nof; case TAB_DIR: case TAB_XML: - poff= loff + 1; + poff= loff + (pcf->Flags & U_VIRTUAL ? 0 : 1); break; case TAB_INI: case TAB_MAC: |