diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
| commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
| tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /storage/connect/tabpivot.cpp | |
| parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
| parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
| download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'storage/connect/tabpivot.cpp')
| -rw-r--r-- | storage/connect/tabpivot.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/connect/tabpivot.cpp b/storage/connect/tabpivot.cpp index 256b454741c..c6d32884417 100644 --- a/storage/connect/tabpivot.cpp +++ b/storage/connect/tabpivot.cpp @@ -1,11 +1,11 @@ /************ TabPivot C++ Program Source Code File (.CPP) *************/ /* PROGRAM NAME: TABPIVOT */ /* ------------- */ -/* Version 1.6 */ +/* Version 1.7 */ /* */ /* COPYRIGHT: */ /* ---------- */ -/* (C) Copyright to the author Olivier BERTRAND 2005-2015 */ +/* (C) Copyright to the author Olivier BERTRAND 2005-2017 */ /* */ /* WHAT THIS PROGRAM DOES: */ /* ----------------------- */ @@ -41,6 +41,7 @@ #include "global.h" #include "plgdbsem.h" #include "xtable.h" +#include "tabext.h" #include "tabcol.h" #include "colblk.h" #include "tabmysql.h" @@ -883,7 +884,7 @@ SRCCOL::SRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int n) /***********************************************************************/ /* Initialize the column as pointing to the source column. */ /***********************************************************************/ -bool SRCCOL::Init(PGLOBAL g, PTDBASE tp) +bool SRCCOL::Init(PGLOBAL g, PTDB tp) { if (PRXCOL::Init(g, tp)) return true; |