diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-02 10:34:51 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-02 10:34:51 +0200 |
commit | e8ea671c2523f56fce0eacabbba05689aa4824f9 (patch) | |
tree | af7b056f4ecff525dd8b0fbaa978635269be0d2a /storage/connect/value.h | |
parent | 893631a8c188817e3294edc11de2087630dde801 (diff) | |
download | mariadb-git-e8ea671c2523f56fce0eacabbba05689aa4824f9.tar.gz |
Commit changes pulled from ob-10.0
Diffstat (limited to 'storage/connect/value.h')
-rw-r--r-- | storage/connect/value.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/storage/connect/value.h b/storage/connect/value.h index 207944594f1..780917c9962 100644 --- a/storage/connect/value.h +++ b/storage/connect/value.h @@ -36,8 +36,9 @@ typedef struct _datpar *PDTP; // For DTVAL DllExport PSZ GetTypeName(int); DllExport int GetTypeSize(int, int); #ifdef ODBC_SUPPORT -/* This function is exported for use in EOM table type DLLs */ -DllExport int TranslateSQLType(int stp, int prec, int& len, char& v); +/* This function is exported for use in OEM table type DLLs */ +DllExport int TranslateSQLType(int stp, int prec, + int& len, char& v, bool& w); #endif DllExport char *GetFormatType(int); DllExport int GetFormatType(char); @@ -359,14 +360,9 @@ class DllExport DTVAL : public TYPVAL<int> { public: // Constructors DTVAL(PGLOBAL g, int n, int p, PSZ fmt); -//DTVAL(PGLOBAL g, PSZ s, int n); -//DTVAL(PGLOBAL g, short i); DTVAL(int n); -//DTVAL(PGLOBAL g, longlong n); -//DTVAL(PGLOBAL g, double f); // Implementation - virtual bool IsZero(void) {return Null;} virtual bool SetValue_pval(PVAL valp, bool chktype); virtual bool SetValue_char(char *p, int n); virtual void SetValue_psz(PSZ s); |