Small fixes for pushbuild: compiler warnings, checking that partitioning is enabled when testing it.

Don't fsync() index file when closing Maria table if not transactional.

mysql-test/suite/maria/r/maria.result:
  piece moved
mysql-test/suite/maria/r/maria_partition.result:
  result
mysql-test/suite/maria/t/maria.test:
  - reset default storage engine at end of test, not in the middle
  - move piece which requires partitioning, to maria_partition.test, otherwise test fails
  on builds without partitioning compiled in
mysql-test/suite/maria/t/maria_partition.test:
  new test for those Maria bugs which are specific of partitioning
mysys/my_uuid.c:
  compiler warning fix (fix imported from latest 5.1-main)
storage/maria/ma_close.c:
  don't fsync() index file when closing table if not transactional
  (same test as in _ma_once_end_block_record() when fsync-ing data file)
storage/maria/ma_create.c:
  compiler warning fix (char* assigned to uchar*)
storage/maria/ma_loghandler.c:
  compiler warning fix (char* assigned to uchar*)

1 files changed, 2 insertions, 2 deletions

diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c
index ca5e94c4754..d1e8331aaa1 100644
--- a/mysys/my_uuid.c
+++ b/mysys/my_uuid.c
@@ -145,12 +145,12 @@ void my_uuid(uchar *to)
     */
     if (nanoseq)
     {
-      long delta;
+      ulong delta;
       DBUG_ASSERT((tv > uuid_time) && (nanoseq > 0));
       /*
         -1 so we won't make tv= uuid_time for nanoseq >= (tv - uuid_time)
       */
-      delta= min(nanoseq, tv - uuid_time -1);
+      delta= min(nanoseq, (ulong)(tv - uuid_time -1));
       tv-= delta;
       nanoseq-= delta;
     }