diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-10-24 16:21:39 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-10-24 16:21:39 +0200 |
| commit | c4cf40c21bb51a5c9c33bed64bb70e167945aa70 (patch) | |
| tree | c26d4a24fc14cea62ee677815ce3b72eee3d8965 /storage/connect/tabxcl.cpp | |
| parent | 4f59b65fb05f049b7fb0585f641ab195f72118d0 (diff) | |
| download | mariadb-git-c4cf40c21bb51a5c9c33bed64bb70e167945aa70.tar.gz | |
- Fix bug: Server crash when using a special column in XCOL tables
modified:
storage/connect/mysql-test/connect/r/xcol.result
storage/connect/mysql-test/connect/t/xcol.test
storage/connect/tabxcl.cpp
Diffstat (limited to 'storage/connect/tabxcl.cpp')
| -rw-r--r-- | storage/connect/tabxcl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/tabxcl.cpp b/storage/connect/tabxcl.cpp index 6cf17c38820..ab758e856d5 100644 --- a/storage/connect/tabxcl.cpp +++ b/storage/connect/tabxcl.cpp @@ -182,8 +182,9 @@ bool TDBXCL::OpenDB(PGLOBAL g) /* Check and initialize the subtable columns. */ /*********************************************************************/ for (PCOL cp = Columns; cp; cp = cp->GetNext()) - if (((PPRXCOL)cp)->Init(g)) - return TRUE; + if (!cp->IsSpecial()) + if (((PPRXCOL)cp)->Init(g)) + return TRUE; /*********************************************************************/ /* Physically open the object table. */ |