summaryrefslogtreecommitdiff
path: root/storage/connect/tabjson.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-01-27 19:18:51 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-01-27 19:18:51 +0100
commitee5a4c8b33b1a0dda9ef7422730dbe32f6b384a9 (patch)
tree90d793031aaec843ea89c4b1014a6dc95301e6d9 /storage/connect/tabjson.h
parente7802bff0e13fc420e3a3421f89a161618b32b0b (diff)
downloadmariadb-git-ee5a4c8b33b1a0dda9ef7422730dbe32f6b384a9.tar.gz
- Begin eliminating on Linux OverloadedVirtual warnings.
However some tests failed. Going to windows to try tracing them. modified: storage/connect/CMakeLists.txt storage/connect/array.h storage/connect/json.h storage/connect/tabdos.h storage/connect/tabjson.h storage/connect/taboccur.cpp storage/connect/tabpivot.h storage/connect/tabutil.h storage/connect/tabxcl.h storage/connect/valblk.h storage/connect/xindex.h
Diffstat (limited to 'storage/connect/tabjson.h')
-rw-r--r--storage/connect/tabjson.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
index 68f79a1526a..b815ccf21ce 100644
--- a/storage/connect/tabjson.h
+++ b/storage/connect/tabjson.h
@@ -77,7 +77,7 @@ class TDBJSN : public TDBDOS {
virtual PTDB CopyOne(PTABS t);
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
virtual PCOL InsertSpecialColumn(PGLOBAL g, PCOL colp);
- virtual int RowNumber(PGLOBAL g, BOOL b = FALSE)
+ virtual int RowNumber(PGLOBAL g, bool b = FALSE)
{return (b) ? N : Fpos + 1;}
// Database routines