After merge fixes

Removed compiler warnings
Fixed clashing function name in maria
Disable maria tests from MySQL level for now


BitKeeper/deleted/.del-ha_maria.cc:
  Rename: libmysqld/ha_maria.cc -> BitKeeper/deleted/.del-ha_maria.cc
BitKeeper/etc/ignore:
  added libmysqld/ha_maria.cc
  ---
  added storage/maria/unittest/maria_control unittest/maria_control
  ---
  added *.Tpo
  ---
  added unittest/page_cache_test_file_1
  ---
  added unittest/pagecache_debug.log
  ---
  added unittest/mysys/mf_pagecache_consist_1k-t-big unittest/mysys/mf_pagecache_consist_1kHC-t-big unittest/mysys/mf_pagecache_consist_1kRD-t-big unittest/mysys/mf_pagecache_consist_1kWR-t-big unittest/mysys/mf_pagecache_consist_64k-t-big unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big
  ---
  added unittest/mysys/mf_pagecache_single_64k-t-big
Makefile.am:
  Don't run 'test-unit' by default (takes too long time)
client/mysqldump.c:
  Fixed compiler warning
include/lf.h:
  Remove compiler warnings about not used require_pins constant
include/pagecache.h:
  LSN should be of type ulonglong
  (This fixes some compiler warnings)
mysql-test/r/events_logs_tests.result:
  Make test predictable
mysql-test/r/view.result:
  Make test results predictable
mysql-test/t/disabled.def:
  Disable maria tests for a while
mysql-test/t/events_logs_tests.test:
  Make test predictable
mysql-test/t/view.test:
  Make test results predictable
mysys/lf_alloc-pin.c:
  #warning ->QQ
mysys/lf_hash.c:
  #warning ->QQ
  Removed compiler warnings
mysys/mf_pagecache.c:
  Removed compiler warnings
mysys/my_rename.c:
  Removed compiler warnings
plugin/daemon_example/daemon_example.c:
  Remove compiler warning
sql/ha_ndbcluster.cc:
  Remove compiler warning
sql/udf_example.c:
  Remove compiler warning
storage/maria/lockman.c:
  Changed #warnings to QQ comment
  Removed compiler warnings
storage/maria/ma_blockrec.c:
  Removed compiler warnings
storage/maria/ma_check.c:
  After merge fixes
storage/maria/ma_key.c:
  After merge fixes
storage/maria/ma_packrec.c:
  After merge fixes
storage/maria/ma_rkey.c:
  After merge fixes
storage/maria/ma_sort.c:
  After merge fixes
storage/maria/ma_sp_defs.h:
  Rename clashing function name
storage/maria/ma_sp_key.c:
  Rename clashing function name
storage/maria/ma_test_all.res:
  New test results
storage/maria/ma_unique.c:
  Fixed compiler warning
storage/maria/tablockman.c:
  #warning -> QQ
storage/maria/tablockman.h:
  #warning -> QQ
storage/maria/trnman.c:
  #warning -> QQ
storage/maria/unittest/lockman2-t.c:
  Removed compiler warnings
storage/maria/unittest/ma_control_file-t.c:
  Removed warning for 'maria_control' file not found
storage/maria/unittest/trnman-t.c:
  Removed compiler warnings
storage/ndb/src/mgmapi/mgmapi.cpp:
  Remove compiler warnings
unittest/mysys/mf_pagecache_consist.c:
  Removed compiler warnings
unittest/mysys/my_atomic-t.c:
  Removed compiler warnings

1 files changed, 50 insertions, 41 deletions

diff --git a/storage/maria/ma_test_all.res b/storage/maria/ma_test_all.res
index 7ffd3378b51..57b0feeeae8 100644
--- a/storage/maria/ma_test_all.res
+++ b/storage/maria/ma_test_all.res
@@ -1,53 +1,62 @@
-maria_chk: MARIA file test1
-maria_chk: warning: Size of indexfile is: 8192          Should be: 16384
-MARIA-table 'test1' is usable but should be fixed
+Running tests with dynamic row format
+Running tests with static row format
+Running tests with block row format
 ma_test2 -s -L -K -R1 -m2000 ;  Should give error 135
-Error: 135 in write at record: 1105
+Error: 135 in write at record: 1099
 got error: 135 when using MARIA-database
+./maria_chk -sm test2 will warn that 'Datafile is almost full'
 maria_chk: MARIA file test2
-maria_chk: warning: Datafile is almost full,      65532 of      65534 used
+maria_chk: warning: Datafile is almost full,      65516 of      65534 used
 MARIA-table 'test2' is usable but should be fixed
-Commands   Used count    Errors   Recover errors
-open                1         0                0
-write              50         0                0
-update              5         0                0
-delete             50         0                0
-close               1         0                0
-extra               6         0                0
-Total             113         0                0
-Commands   Used count    Errors   Recover errors
-open                2         0                0
-write             100         0                0
-update             10         0                0
-delete            100         0                0
-close               2         0                0
-extra              12         0                0
-Total             226         0                0
-
-real	0m0.994s
-user	0m0.432s
-sys	0m0.184s
-
-real	0m2.153s
-user	0m1.196s
-sys	0m0.228s
-
-real	0m1.483s
-user	0m0.772s
+
+real	0m0.808s
+user	0m0.584s
+sys	0m0.212s
+
+real	0m0.780s
+user	0m0.584s
+sys	0m0.176s
+
+real	0m0.809s
+user	0m0.616s
 sys	0m0.180s
 
-real	0m1.992s
-user	0m1.180s
+real	0m1.356s
+user	0m1.140s
 sys	0m0.188s
 
-real	0m2.028s
+real	0m0.783s
+user	0m0.600s
+sys	0m0.176s
+
+real	0m1.390s
 user	0m1.184s
 sys	0m0.152s
 
-real	0m1.878s
-user	0m1.028s
-sys	0m0.136s
+real	0m1.875s
+user	0m1.632s
+sys	0m0.244s
+
+real	0m1.313s
+user	0m1.148s
+sys	0m0.160s
+
+real	0m1.846s
+user	0m1.644s
+sys	0m0.188s
+
+real	0m1.875s
+user	0m1.632s
+sys	0m0.212s
+
+real	0m1.819s
+user	0m1.672s
+sys	0m0.124s
+
+real	0m2.117s
+user	0m1.816s
+sys	0m0.292s
 
-real	0m1.980s
-user	0m1.116s
-sys	0m0.192s
+real	0m1.871s
+user	0m1.636s
+sys	0m0.196s