diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-19 18:55:25 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-19 18:55:25 +0100 |
| commit | 2d2e110bcef08a772cae8e2ee7d226e2831f6459 (patch) | |
| tree | b0bb91ca673f4fee88b6a7a2e3bdecac4b52cd67 /storage/connect/value.h | |
| parent | fb3f46967cfe4f3f28d13f5083a76b7c939e2724 (diff) | |
| download | mariadb-git-2d2e110bcef08a772cae8e2ee7d226e2831f6459.tar.gz | |
- Adding the JSON table type
added:
storage/connect/json.cpp
storage/connect/json.h
storage/connect/mysql-test/connect/r/json.result
storage/connect/mysql-test/connect/std_data/biblio.jsn
storage/connect/mysql-test/connect/std_data/expense.jsn
storage/connect/mysql-test/connect/std_data/mulexp3.jsn
storage/connect/mysql-test/connect/std_data/mulexp4.jsn
storage/connect/mysql-test/connect/std_data/mulexp5.jsn
storage/connect/mysql-test/connect/t/json.test
storage/connect/tabjson.cpp
storage/connect/tabjson.h
modified:
storage/connect/CMakeLists.txt
storage/connect/engmsg.h
storage/connect/filamtxt.h
storage/connect/ha_connect.cc
storage/connect/msgid.h
storage/connect/mycat.cc
storage/connect/plgdbsem.h
storage/connect/tabdos.cpp
storage/connect/value.cpp
storage/connect/value.h
Diffstat (limited to 'storage/connect/value.h')
| -rw-r--r-- | storage/connect/value.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/value.h b/storage/connect/value.h index c2cc24894ae..c5aeb5c2a2f 100644 --- a/storage/connect/value.h +++ b/storage/connect/value.h @@ -190,9 +190,9 @@ class DllExport TYPVAL : public VALUE { virtual void Print(PGLOBAL g, char *, uint); protected: -//static TYPE MinMaxVal(bool b); -// TYPE SafeAdd(TYPE n1, TYPE n2); -// TYPE SafeMult(TYPE n1, TYPE n2); + static TYPE MinMaxVal(bool b); + TYPE SafeAdd(TYPE n1, TYPE n2); + TYPE SafeMult(TYPE n1, TYPE n2); bool Compall(PGLOBAL g, PVAL *vp, int np, OPVAL op); // Default constructor not to be used |