diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-07-20 20:39:17 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-07-20 20:39:17 +0200 |
commit | 26e4b69ffd45332fb16a18ce25481e7ac0c69b84 (patch) | |
tree | 4a5187f196356cbfccd42885327ce86c1f1a30f2 /storage/connect/array.h | |
parent | 4b2092ebeac009ba1cfbb2c8a6c3ace0eab76bcb (diff) | |
download | mariadb-git-26e4b69ffd45332fb16a18ce25481e7ac0c69b84.tar.gz |
- FIX errors and some gcc warnings
modified:
storage/connect/array.cpp
storage/connect/array.h
storage/connect/blkfil.cpp
storage/connect/blkfil.h
storage/connect/filter.cpp
storage/connect/filter.h
storage/connect/ha_connect.cc
storage/connect/tabdos.cpp
- FIX problems of DIR table on LINUX:
The order of the result is not the same than the one on Windows
An error occurs when no file match the pattern
Also the row numbers may also be different (not fixed yet)
modified:
storage/connect/mysql-test/connect/r/part_file.result
storage/connect/mysql-test/connect/r/part_table.result
storage/connect/mysql-test/connect/t/part_file.test
Diffstat (limited to 'storage/connect/array.h')
-rw-r--r-- | storage/connect/array.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/array.h b/storage/connect/array.h index c05757d7abc..dee1b7a846a 100644 --- a/storage/connect/array.h +++ b/storage/connect/array.h @@ -52,12 +52,12 @@ class DllExport ARRAY : public XOBJECT, public CSORT { // Array descblock virtual bool Compare(PXOB) {assert(FALSE); return FALSE;} virtual bool SetFormat(PGLOBAL, FORMAT&) {assert(FALSE); return FALSE;} //virtual int CheckSpcCol(PTDB, int) {return 0;} - virtual void Print(PGLOBAL g, FILE *f, UINT n); - virtual void Print(PGLOBAL g, char *ps, UINT z); + virtual void Print(PGLOBAL g, FILE *f, uint n); + virtual void Print(PGLOBAL g, char *ps, uint z); void Empty(void); void SetPrecision(PGLOBAL g, int p); bool AddValue(PGLOBAL g, PSZ sp); - bool AddValue(PGLOBAL g, SHORT n); + bool AddValue(PGLOBAL g, short n); bool AddValue(PGLOBAL g, int n); bool AddValue(PGLOBAL g, double f); bool AddValue(PGLOBAL g, PXOB xp); |