after-merge fixes for 10.0-connectmariadb-10.0.13

3 files changed, 7 insertions, 7 deletions

diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp
index 78b6ee58b24..d6c3906dac3 100644
--- a/storage/connect/filamfix.cpp
+++ b/storage/connect/filamfix.cpp
@@ -569,7 +569,7 @@ bool FIXFAM::MoveIntermediateLines(PGLOBAL g, bool *b)
 /***********************************************************************/
 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;
   bool  moved;
 
@@ -1479,7 +1479,7 @@ bool BGXFAM::MoveIntermediateLines(PGLOBAL g, bool *b)
 /***********************************************************************/
 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;
   bool  moved;
 
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp
index 28059d4f28a..9c0cd51458d 100644
--- a/storage/connect/filamtxt.cpp
+++ b/storage/connect/filamtxt.cpp
@@ -475,7 +475,7 @@ bool DOSFAM::AllocateBuffer(PGLOBAL g)
   MODE mode = Tdbp->Mode;
 
   // Lrecl does not include line ending
-  Buflen = Lrecl + Ending + ((Bin) ? 1 : 0);
+  Buflen = Lrecl + Ending + ((Bin) ? 1 : 0) + 1;
 
   if (trace)
     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)
   {
-  char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
+  const char *crlf = "\n", *mode = UseTemp ? "rb" : "r+b";
   int  *ix, i;
   bool  moved, b = false;
 
@@ -1084,7 +1084,7 @@ err:
 /***********************************************************************/
 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;
   bool  moved;
 
@@ -1535,7 +1535,7 @@ int BLKFAM::WriteBuffer(PGLOBAL g)
     /*******************************************************************/
     /*  Mode == MODE_UPDATE.                                           */
     /*******************************************************************/
-    char  *crlf;
+    const char  *crlf;
     size_t len;
     int   curpos = ftell(Stream);
     bool   moved = true;
diff --git a/storage/connect/mysql-test/connect/t/part_file.test b/storage/connect/mysql-test/connect/t/part_file.test
index 04f07b83ec7..159908b6d9b 100644
--- a/storage/connect/mysql-test/connect/t/part_file.test
+++ b/storage/connect/mysql-test/connect/t/part_file.test
@@ -72,7 +72,7 @@ SHOW INDEX FROM t1;
 # TODO: this fails on Linux

 #SELECT * FROM dr1 ORDER BY fname, ftype;

 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(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';