• unknown's avatar
    After merge fixes · 7412f0fa
    unknown authored
    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
    7412f0fa
ma_unique.c 6.88 KB