10.0-base merge.

Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)

2 files changed, 3 insertions, 3 deletions

diff --git a/unittest/mysys/explain_filename-t.cc b/unittest/mysys/explain_filename-t.cc
index 096fdf3b168..69ce51c0446 100644
--- a/unittest/mysys/explain_filename-t.cc
+++ b/unittest/mysys/explain_filename-t.cc
@@ -65,7 +65,7 @@ int main(int argc __attribute__((unused)),char *argv[])
 {
   MY_INIT(argv[0]);
   setup();
-  plan(NO_PLAN);
+  plan(22);
 
   test_1("test/t1.ibd",
          "Database \"test\", Table \"t1.ibd\"",
@@ -160,6 +160,6 @@ int main(int argc __attribute__((unused)),char *argv[])
          EXPLAIN_PARTITIONS_AS_COMMENT);
 
   my_end(0);
-  return 0;
+  return exit_status();
 }
 
diff --git a/unittest/mysys/ma_dyncol-t.c b/unittest/mysys/ma_dyncol-t.c
index a250b2624b6..51e84bc4e40 100644
--- a/unittest/mysys/ma_dyncol-t.c
+++ b/unittest/mysys/ma_dyncol-t.c
@@ -577,7 +577,7 @@ void test_empty_string()
   uint number_of_uint;
   int rc;
   uint ids[1]= {1};
-  DYNAMIC_COLUMN_VALUE vals[0];
+  DYNAMIC_COLUMN_VALUE vals[1];
   /* empty string */
   bzero(&str, sizeof(str));