mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

after-merge fixes for 10.0-connect

Browse source
This commit is contained in:
Sergei Golubchik 2014-08-08 17:58:45 +02:00
parent 2894758961
commit 4105cbf4a2
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/connect/filamfix.cpp
View file

@ -569,7 +569,7 @@ bool FIXFAM::MoveIntermediateLines(PGLOBAL g, bool *b)
/***********************************************************************/ /***********************************************************************/
bool FIXFAM::MakeDeletedFile(PGLOBAL g) bool FIXFAM::MakeDeletedFile(PGLOBAL g)
{ {
char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b"; const char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
int *ix, i; int *ix, i;
bool moved; bool moved;
@ -1479,7 +1479,7 @@ bool BGXFAM::MoveIntermediateLines(PGLOBAL g, bool *b)
/***********************************************************************/ /***********************************************************************/
bool BGXFAM::MakeDeletedFile(PGLOBAL g) bool BGXFAM::MakeDeletedFile(PGLOBAL g)
{ {
char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b"; const char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
int *ix, i; int *ix, i;
bool moved; bool moved;

8
storage/connect/filamtxt.cpp
View file

@ -475,7 +475,7 @@ bool DOSFAM::AllocateBuffer(PGLOBAL g)
MODE mode = Tdbp->Mode; MODE mode = Tdbp->Mode;
// Lrecl does not include line ending // Lrecl does not include line ending
Buflen = Lrecl + Ending + ((Bin) ? 1 : 0); Buflen = Lrecl + Ending + ((Bin) ? 1 : 0) + 1;
if (trace) if (trace)
htrc("SubAllocating a buffer of %d bytes\n", Buflen); htrc("SubAllocating a buffer of %d bytes\n", Buflen);
@ -1010,7 +1010,7 @@ bool DOSFAM::MoveIntermediateLines(PGLOBAL g, bool *b)
/***********************************************************************/ /***********************************************************************/
bool DOSFAM::MakeUpdatedFile(PGLOBAL g) bool DOSFAM::MakeUpdatedFile(PGLOBAL g)
{ {
char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b"; const char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
int *ix, i; int *ix, i;
bool moved, b = false; bool moved, b = false;
@ -1084,7 +1084,7 @@ err:
/***********************************************************************/ /***********************************************************************/
bool DOSFAM::MakeDeletedFile(PGLOBAL g) bool DOSFAM::MakeDeletedFile(PGLOBAL g)
{ {
char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b"; const char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
int *ix, i; int *ix, i;
bool moved; bool moved;
@ -1535,7 +1535,7 @@ int BLKFAM::WriteBuffer(PGLOBAL g)
/*******************************************************************/ /*******************************************************************/
/* Mode == MODE_UPDATE. */ /* Mode == MODE_UPDATE. */
/*******************************************************************/ /*******************************************************************/
char *crlf; const char *crlf;
size_t len; size_t len;
int curpos = ftell(Stream); int curpos = ftell(Stream);
bool moved = true; bool moved = true;

2
storage/connect/mysql-test/connect/t/part_file.test
View file

@ -72,7 +72,7 @@ SHOW INDEX FROM t1;
# TODO: this fails on Linux # TODO: this fails on Linux
#SELECT * FROM dr1 ORDER BY fname, ftype; #SELECT * FROM dr1 ORDER BY fname, ftype;
INSERT INTO t1(id,msg) VALUES(4, 'four'); INSERT INTO t1(id,msg) VALUES(4, 'four');
SELECT * FROM dr1; SELECT * FROM dr1 ORDER BY fname, ftype;
INSERT INTO t1(id,msg) VALUES(7,'seven'),(10,'ten'),(40,'forty'),(60,'sixty'),(81,'eighty one'); INSERT INTO t1(id,msg) VALUES(7,'seven'),(10,'ten'),(40,'forty'),(60,'sixty'),(81,'eighty one');
INSERT INTO t1(id,msg) VALUES(72,'seventy two'),(20,'twenty'),(1,'one'),(35,'thirty five'),(8,'eight'); INSERT INTO t1(id,msg) VALUES(72,'seventy two'),(20,'twenty'),(1,'one'),(35,'thirty five'),(8,'eight');
SELECT partition_name, table_rows FROM information_schema.partitions WHERE table_name = 't1'; SELECT partition_name, table_rows FROM information_schema.partitions WHERE table_name = 't1';