database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- FIX errors and some gcc warnings

Browse Source 
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
This commit is contained in:
Olivier Bertrand
2014-07-20 20:39:17 +02:00
parent 4b2092ebea
commit 26e4b69ffd
11 changed files with 110 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/tabdos.cpp
View File

@@ -933,7 +933,7 @@ bool TDBDOS::GetBlockValues(PGLOBAL g)
int flen = -1;
PlugSetPath(filename, defp->Fn, GetPath());
h = open(filename, _O_RDONLY);
h = open(filename, O_RDONLY);
flen = (h == -1 && errno == ENOENT) ? 0 : _filelength(h);
defp->SetOptimized((flen) ? 0 : 1);
@@ -2615,12 +2615,12 @@ bool DOSCOL::SetMinMax(PGLOBAL g)
bool DOSCOL::SetBitMap(PGLOBAL g)
{
int i, m, n;
PULONG bmp;
uint *bmp;
PTDBDOS tp = (PTDBDOS)To_Tdb;
PDBUSER dup = PlgGetUser(g);
n = tp->Txfp->CurNum;
bmp = (PULONG)Bmap->GetValPtr(Nbm * tp->Txfp->CurBlk);
bmp = (uint*)Bmap->GetValPtr(Nbm * tp->Txfp->CurBlk);
// Extract column value from current line
ReadColumn(g);