diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-02 22:30:40 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-02 22:30:40 +0100 |
commit | 8103dd5e88ea54c06d991cd4342e75cfab7ef11d (patch) | |
tree | acc0139e1e86953e9be5dfec523fc9aa1b310a47 /storage | |
parent | 5972b56a6d43aceb89e5242b6c323743eba9c71e (diff) | |
download | mariadb-git-8103dd5e88ea54c06d991cd4342e75cfab7ef11d.tar.gz |
- Some end of lines changed from CRLF to LF
modified:
storage/connect/reldef.h
storage/connect/tabxml.h
storage/connect/value.h
Diffstat (limited to 'storage')
-rw-r--r-- | storage/connect/reldef.h | 5 | ||||
-rw-r--r-- | storage/connect/tabxml.h | 4 | ||||
-rw-r--r-- | storage/connect/value.h | 40 |
3 files changed, 22 insertions, 27 deletions
diff --git a/storage/connect/reldef.h b/storage/connect/reldef.h index ac42bb38b37..145544881a6 100644 --- a/storage/connect/reldef.h +++ b/storage/connect/reldef.h @@ -76,10 +76,7 @@ class DllExport TABDEF : public RELDEF { /* Logical table descriptor */ virtual PIXDEF GetIndx(void) {return NULL;} virtual void SetIndx(PIXDEF xp) {} virtual bool IsHuge(void) {return false;} - const CHARSET_INFO *data_charset() - { - return m_data_charset; - } + const CHARSET_INFO *data_charset() {return m_data_charset;} // Methods bool DropTable(PGLOBAL g, PSZ name); diff --git a/storage/connect/tabxml.h b/storage/connect/tabxml.h index 4c9fc27a8d7..8dbe78f3488 100644 --- a/storage/connect/tabxml.h +++ b/storage/connect/tabxml.h @@ -102,9 +102,7 @@ class DllExport TDBXML : public TDBASE { virtual void CloseDB(PGLOBAL g); virtual int CheckWrite(PGLOBAL g) {Checked = true; return 0;} virtual const CHARSET_INFO *data_charset() - { - return &my_charset_utf8_general_ci; - } + {return &my_charset_utf8_general_ci;} protected: // Members diff --git a/storage/connect/value.h b/storage/connect/value.h index 500c65db7fe..99e71b5d699 100644 --- a/storage/connect/value.h +++ b/storage/connect/value.h @@ -212,25 +212,25 @@ class DllExport TYPVAL<PSZ>: public VALUE { virtual void *GetTo_Val(void) {return Strp;} // Methods - virtual bool SetValue_pval(PVAL valp, bool chktype);
- virtual void SetValue_char(char *p, int n);
- virtual void SetValue_psz(PSZ s);
- virtual void SetValue_pvblk(PVBLK blk, int n);
- virtual void SetValue(short i);
- virtual void SetValue(int n);
- virtual void SetValue(longlong n);
- virtual void SetValue(double f);
- virtual void SetBinValue(void *p);
- virtual bool GetBinValue(void *buf, int buflen, bool go);
- virtual char *ShowValue(char *buf, int);
- virtual char *GetCharString(char *p);
- virtual char *GetShortString(char *p, int n);
- virtual char *GetIntString(char *p, int n);
- virtual char *GetBigintString(char *p, int n);
- virtual char *GetFloatString(char *p, int n, int prec = -1);
- virtual bool IsEqual(PVAL vp, bool chktype);
- virtual bool FormatValue(PVAL vp, char *fmt);
- virtual bool SetConstFormat(PGLOBAL, FORMAT&);
+ virtual bool SetValue_pval(PVAL valp, bool chktype); + virtual void SetValue_char(char *p, int n); + virtual void SetValue_psz(PSZ s); + virtual void SetValue_pvblk(PVBLK blk, int n); + virtual void SetValue(short i); + virtual void SetValue(int n); + virtual void SetValue(longlong n); + virtual void SetValue(double f); + virtual void SetBinValue(void *p); + virtual bool GetBinValue(void *buf, int buflen, bool go); + virtual char *ShowValue(char *buf, int); + virtual char *GetCharString(char *p); + virtual char *GetShortString(char *p, int n); + virtual char *GetIntString(char *p, int n); + virtual char *GetBigintString(char *p, int n); + virtual char *GetFloatString(char *p, int n, int prec = -1); + virtual bool IsEqual(PVAL vp, bool chktype); + virtual bool FormatValue(PVAL vp, char *fmt); + virtual bool SetConstFormat(PGLOBAL, FORMAT&); // Specialized functions template <class T> @@ -291,7 +291,7 @@ class DllExport DTVAL : public TYPVAL<int> { PDTP Pdtp; // To the DATPAR structure char *Sdate; // Utility char buffer int DefYear; // Used by ExtractDate - int Len; // Used by CHAR scalar function
+ int Len; // Used by CHAR scalar function }; // end of class DTVAL #endif // __VALUE__H__ |