1. 25 Feb, 2008 1 commit
    • unknown's avatar
      Build maria_dump_log under Windows. Enable maria_chk --zerofill-keep-lsn · f423979c
      unknown authored
      in release builds, use it to fine-tune physical file comparisons in
      ma_test_recovery.pl.
      
      
      storage/maria/CMakeLists.txt:
        build maria_dump_log under Windows too
      storage/maria/maria_chk.c:
        make --zerofill-keep-lsn usable in release builds too, it makes sense.
        This option needn't reset state's LSNs, and it's more useful if it
        does not (see added comment) as it changes less the table.
      storage/maria/unittest/ma_test_recovery.pl:
        - getting rid of 'cmp'
        - if physical comparison of two MAD or MAI files fails, it might
        be in irrelevant portions (unushed index or data page pieces):
        we use --zerofill-keep-lsn and retry the comparison. This fixes
        a part of test failures under Windows.
      f423979c
  2. 22 Feb, 2008 2 commits
  3. 21 Feb, 2008 5 commits
    • unknown's avatar
      Fixes for ma_test_recovery.pl on OS X. · 662c233c
      unknown authored
      
      storage/maria/unittest/ma_test_recovery.pl:
        .exe is for win32, win64, cygwin but not darwin.
        Some OS X machines have md5 instead of md5sum.
      662c233c
    • unknown's avatar
      Make ma_test_all-t find its eggs on Darwin machines. · b6e3bc63
      unknown authored
      
      storage/maria/unittest/ma_test_all-t:
        .exe is for win32, win64, cygwin, but not darwin
      b6e3bc63
    • unknown's avatar
      fix for bug in Solaris 10 Sparc 64 bit (misaligned buffer in the · 8edb454a
      unknown authored
      log handler).
      
      
      storage/maria/ma_loghandler.c:
        Buffers on the stack must be properly aligned as pagecache_read()
        will use bmove512() on them. Fixes hang in maria-recovery.test
        on Solaris 10 Sparc 64 bit.
      storage/maria/ma_pagecache.c:
        comment
      8edb454a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 6c964d7e
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      
      dbug/dbug.c:
        Auto merged
      mysys/lf_alloc-pin.c:
        Auto merged
      storage/maria/lockman.c:
        Auto merged
      storage/maria/ma_open.c:
        Auto merged
      storage/maria/ma_recovery.c:
        Auto merged
      storage/maria/unittest/ma_test_recovery.pl:
        Manual merge
      6c964d7e
    • unknown's avatar
      Fixed problems with ma_test2 and mi_test2 on high-byte-first system · 140943de
      unknown authored
      Fixed bug in ma_test2 when last row in table is deleted
      Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum)
      Fixed some compiler warnings generated by the Forte compiler
      
      
      dbug/dbug.c:
        Added cast to get rid of compiler warning
      mysys/lf_alloc-pin.c:
        Added cast to get rid of compiler warning
      mysys/my_bitmap.c:
        Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings
      mysys/my_compress.c:
        Removed wrong cast to get rid of compiler warning
      storage/maria/lockman.c:
        Added cast to get rid of compiler warning
      storage/maria/ma_open.c:
        Added fix from MyISAM to allocate space in key buffer for nod pointer
      storage/maria/ma_recovery.c:
        Fixed initialization that caused compiler warning
      storage/maria/ma_rsame.c:
        More DBUG_PRINT
      storage/maria/ma_scan.c:
        Better comment
      storage/maria/ma_statrec.c:
        More DBUG_PRINT and comments
        Fixed indentation
      BitKeeper/etc/ignore:
        added storage/maria/unittest/tmp/*
      storage/maria/ma_test2.c:
        Fixed bug that caused maria_rsame() to fail if test removed last row
        Fixed wrong usage of longget();  Should be uint4korr()
      storage/maria/unittest/ma_test_recovery.pl:
        Use md5sum or digest to calculate md5.
        This allows this script to be run on Linux and Solaris
      storage/myisam/mi_test2.c:
        Fixed wrong usage of longget();  Should be uint4korr()
      strings/ctype.c:
        Added casts to get rid of compiler warnings
      sql-bench/myisam.cnf:
        New BitKeeper file ``sql-bench/myisam.cnf''
      140943de
  4. 20 Feb, 2008 8 commits
    • unknown's avatar
      non-debug build should not cause ma_test_all-t to always fail: · e2fe00b3
      unknown authored
      make ma_test_recovery.pl return 0 if it skips itself.
      
      
      storage/maria/unittest/ma_test_recovery.pl:
        non-debug build should not cause ma_test_all-t to always fail
      e2fe00b3
    • unknown's avatar
      Working around tar's 99-char limit in file names · 3697eb12
      unknown authored
      
      configure.in:
        this tree has version 5.1.23, release clone has version 5.1.23a-maria-alpha;
        it mostly matters because it makes the file's name 1 byte shorter
        and thus below tar's 99-chars limit...
      3697eb12
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria · c0c9342d
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-maria-monty
      
      c0c9342d
    • unknown's avatar
      need to include ma_test_all-t and ma_test_recovery.* into the source · cad49c82
      unknown authored
      tarball, so that those tests are run on all platforms.
      
      cad49c82
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria · 8055b0bd
      unknown authored
      into  hynda.mysql.fi:/home/my/mysql-maria
      
      8055b0bd
    • unknown's avatar
      New version of ma_test_recovery.pl · 8d78b095
      unknown authored
      
      storage/maria/ma_test_recovery:
        Made the shell version empty to avoid modifying
        files in two places. Linked to the current one.
      storage/maria/unittest/ma_test_recovery.pl:
        New version of ma_test_recovery.pl
        Added --help and --version, made a function
        of the main part, removed all calls to unix
        mv and cp
      8d78b095
    • unknown's avatar
      Fixes for bugs (my_atomic and Maria log handler) observed on · d4cd242f
      unknown authored
      Solaris 10 Sparc 64bit.
      
      
      include/my_atomic.h:
        Prototypes in the non-inline (extern) case were wrong: they were
        missing "U_a" i.e. "volatile *". Caused a segfault in my_atomic-t
        on Solaris10 Sparc 64.
      storage/maria/ma_loghandler.c:
        Move "buffer" array up in the struct, to get it aligned on long-boundary
        so that page cache can use bmove512() (it was not aligned and bmove512()
        was used, causing SIGBUS on Solaris10 Sparc 64).
      storage/maria/unittest/ma_pagecache_consist.c:
        doing *(uint*)(charbuff)=something is not ok on sparc machines, we must
        use int4store/uint4korr. Fixes a SIGBUS on Solaris10 Sparc 64.
      d4cd242f
    • unknown's avatar
      ha_maria.cc: · da9efd78
      unknown authored
        Adjust to match storage engine API, 'mysql_var_update_func' function
        prototype changed so that last argument now "void *save" with "const"
      
      
      storage/maria/ha_maria.cc:
        Adjust to match storage engine API, 'mysql_var_update_func' function
        prototype changed so that last argument now "void *save" with "const"
      da9efd78
  5. 19 Feb, 2008 7 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-maria · 21cdd499
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
      
      21cdd499
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/p1-bug34598.2 · 6b796ac3
      unknown authored
      into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.maria
      
      
      include/mysql/plugin.h:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      6b796ac3
    • unknown's avatar
      Bug#34598 · 958df8ba
      unknown authored
        "crash on hpita: Invalid address alignment"
        Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
        less than size of machine alignment requirement.
      
      
      include/mysql/plugin.h:
        bug34598
          change of update func prototype
      sql/sql_plugin.cc:
        bug34598
          Avoid dangerous pointer arithmetic which can cause unaligned word access.
          Change of update function prototype
      958df8ba
    • unknown's avatar
      Fix for build failure · 52f3366b
      unknown authored
      
      libmysql/get_password.c:
        fix for build failure (no bool in C)
      52f3366b
    • unknown's avatar
      Fix for build failures. Putting back "#define bool BOOL" under Windows · 550b2ee4
      unknown authored
      until Windows team confers.
      
      
      client/get_password.c:
        fix for build failure (HPUX etc): no bool in C
      dbug/dbug.c:
        typo
      include/config-win.h:
        putting back the infamous #define, because without it we have 650
        distinct compiler warnings "forcing value to bool 'true' or 'false'"
        (C4800), Windows team will confer on what to do.
      include/thr_alarm.h:
        fix for build failure on Windows
      libmysql/dll.c:
        fix for build failure on Windows
      mysys/thr_alarm.c:
        fix for build failure on HPUX
      550b2ee4
    • unknown's avatar
      dbug.c: · de1026b2
      unknown authored
        SCCS merged
      
      
      dbug/dbug.c:
        SCCS merged
      de1026b2
    • unknown's avatar
      Fix for failure of ma_test_loghandler_long-t on Windows · 09ab159d
      unknown authored
      
      dbug/dbug.c:
        importing change from 6.0, which speeds up --debug on Windows (no sync)
      storage/maria/unittest/ma_test_loghandler-t.c:
        this test needs ~80 open files (logs)
      09ab159d
  6. 18 Feb, 2008 7 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/maria/mysql-maria · 36cf5f96
      unknown authored
      into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release
      
      36cf5f96
    • unknown's avatar
      Merge from 5.1-build of the "my_bool for C" changeset. · 340f3369
      unknown authored
      Removing "#define bool BOOL" as it's dangerous.
      
      
      include/config-win.h:
        This #define was confusing: a) it changes the semantics of bool but
        only on Windows (C++ standard says that casting int to bool to int
        yields 0 or 1, but if using BOOL (which is int) this breaks, see
        old BUG 11567 "Variable 'foreign_key_checks', and other variables,
        differs binlog tests") b) it is not needed in C++ which has a bool type
        c) it is not needed in C where we must use my_bool as bool either does
        not exist or changes size between C and C++.
      storage/maria/ma_check.c:
        my_bool for C
      storage/maria/ma_dynrec.c:
        my_bool for C
      storage/maria/ma_search.c:
        my_bool for C
      storage/maria/ma_write.c:
        my_bool for C
      storage/maria/maria_def.h:
        my_bool for C
      storage/maria/maria_pack.c:
        my_bool for C
      340f3369
    • unknown's avatar
      Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca · 9661026a
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-maria-monty
      
      
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/replace.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_dynrec.c:
        Auto merged
      storage/myisam/mi_search.c:
        Auto merged
      storage/myisam/mi_update.c:
        Auto merged
      storage/myisam/mi_write.c:
        Auto merged
      storage/myisam/myisamlog.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      include/my_global.h:
        merge
      storage/myisam/myisamdef.h:
        merge
      9661026a
    • unknown's avatar
      Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> · e2103aaf
      unknown authored
      value" error even though the value was correct): a C function in my_getopt.c
      was taking bool* in parameter and was called from C++ sql_plugin.cc,
      but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
      mismatches. Fixed, all other occurences of bool in C are removed, future
      ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
      
      
      client/mysqldump.c:
        my_bool for C
      client/mysqltest.c:
        my_bool for C
      extra/replace.c:
        my_bool for C
      include/my_getopt.h:
        my_bool for C
      include/my_global.h:
        Prevent people from using bool in C, it causes real bugs.
      include/my_sys.h:
        my_bool for C
      include/my_time.h:
        my_bool for C
      include/thr_lock.h:
        my_bool for C
      libmysql/libmysql.c:
        my_bool for C
      mysys/charset.c:
        my_bool for C
      mysys/my_getopt.c:
        my_bool for C
      mysys/queues.c:
        my_bool for C
      mysys/thr_lock.c:
        my_bool for C
      regex/reginit.c:
        my_bool for C
      sql/set_var.cc:
        C functions use my_bool so we must use my_bool too.
      sql/sql_plugin.cc:
        C functions use my_bool so we must use my_bool too.
        This fixes a real observed bug of Maria, because on some Mac OS X,
        sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong.
        Removing useless line.
      storage/heap/hp_update.c:
        my_bool for C
      storage/myisam/mi_check.c:
        my_bool for C
      storage/myisam/mi_dynrec.c:
        my_bool for C
      storage/myisam/mi_search.c:
        my_bool for C
      storage/myisam/mi_update.c:
        my_bool for C
      storage/myisam/mi_write.c:
        my_bool for C
      storage/myisam/myisamdef.h:
        my_bool for C
      storage/myisam/myisamlog.c:
        my_bool for C
      storage/myisam/myisampack.c:
        my_bool for C
      tests/mysql_client_test.c:
        my_bool for C
      unittest/mysys/bitmap-t.c:
        my_bool for C
      vio/viosslfactories.c:
        my_bool for C
      e2103aaf
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.1-maria-alpha-release · e3ed3d5a
      unknown authored
      into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release
      
      e3ed3d5a
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca · 0e934532
      unknown authored
      into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release
      
      
      libmysqld/CMakeLists.txt:
        Auto merged
      0e934532
    • unknown's avatar
      CMakeLists.txt: · 20d2ce58
      unknown authored
        Missing "sql_profile.cc" was added
      
      
      libmysqld/CMakeLists.txt:
        Missing "sql_profile.cc" was added
      20d2ce58
  7. 15 Feb, 2008 2 commits
    • unknown's avatar
      Fix for maria.test failure in embedded server (test split) · 05f3e1c5
      unknown authored
      
      mysql-test/r/maria.result:
        result update
      mysql-test/t/maria.test:
        The embedded server translates INSERT DELAYED to plain INSERT
        so does not produce an error; moving this test to a new test
        which is not run for the embedded server.
      mysql-test/r/maria_notembedded.result:
        result is ok
      mysql-test/t/maria_notembedded.test:
        New test for cases where embedded server is different.
      05f3e1c5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-maria · 953b2e0e
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
      
      953b2e0e
  8. 13 Feb, 2008 8 commits
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-maria · 1dc6e35e
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
      
      1dc6e35e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 95a04ca9
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      95a04ca9
    • unknown's avatar
      skip dbug tests if DBUG_OFF · 707835f0
      unknown authored
      
      include/my_dbug.h:
        warnings
      707835f0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · f03d3a55
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      f03d3a55
    • unknown's avatar
      Fixed compiler warnings in a lot of files · dff4e5e1
      unknown authored
      Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value
      Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
      
      
      client/get_password.c:
        Fixed compiler warning
      cmd-line-utils/readline/bind.c:
        Fixed compiler warning
      cmd-line-utils/readline/chardefs.h:
        Fixed compiler warning by adding marco to be used when largest_char is 255
      cmd-line-utils/readline/display.c:
        Fixed compiler warnings by removing not accessed variables
      cmd-line-utils/readline/histexpand.c:
        Fixed compiler warnings by removing not accessed variables
      cmd-line-utils/readline/history.c:
        Fixed compiler warnings by adding cast
      cmd-line-utils/readline/text.c:
        Fixed compiler warnings by removing not accessed variables and adding casts
      dbug/dbug.c:
        Fixed compiler warnings by changing types
      include/mysql_com.h:
        Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value
      libmysql/libmysql.c:
        Fixed compiler warning
      mysql-test/t/query_cache_debug.test:
        Mark test as BIG as it uses a lot of memory
      mysys/mf_iocache2.c:
        Fixed compiler warnings by adding cast
      sql/event_data_objects.cc:
        Fixed compiler warnings by removing not used code
      sql/events.cc:
        Fixed compiler warnings by removing not used code
      sql/field.cc:
        Fixed compiler warnings by adding cast and removed not accessed variables
      sql/ha_partition.cc:
        Fixed compiler warnings by removing not used code
      sql/item.cc:
        Fixed compiler warnings by removing not accessed variables
        Use IMPOSSIBLE_RESULT instead of (Item_result)-1
      sql/item_cmpfunc.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/item_func.cc:
        Fixed compiler warnings by removing not used code and not accessed variables
        Added IMPOSSIBLE_RESULT
      sql/item_subselect.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/item_xmlfunc.cc:
        Fixed forgotten setting of xpath->error
      sql/log.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/log_event.cc:
        Added IMPOSSIBLE_RESULT into switch
        Fixed wrong usage of DBUG_ASSERT(1)
        Removed always true DBUG_ASSERT()
      sql/mysqld.cc:
        Fixed compiler warnings by adding casts for ULONG_MAX
      sql/opt_sum.cc:
        Fixed compiler warnings by removing not used code
        Removed wrong DBUG_ASSERT()
      sql/partition_info.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/rpl_injector.h:
        Removed always true part from DBUG_ASSERT() to remove compiler warning
      sql/spatial.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_acl.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_base.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_cache.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_class.cc:
        Fixed compiler warnings by:
        - Removing always true part from DBUG_ASSERT()
        - Removing not used code
        - Added IMPOSSIBLE_RESULT into switch
      sql/sql_load.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_parse.cc:
        Fixed compiler warnings by:
        - Removing not accessed variables
        - Removing always true part from DBUG_ASSERT()
        - Removing not used code
      sql/sql_plugin.cc:
        Added comment
      sql/sql_prepare.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/sql_show.cc:
        Fixed compiler warnings by using correct cast
      sql/sql_table.cc:
        Fixed compiler warnings by removing not used code and removing not accessed variables
      sql/table.cc:
        Fixed compiler warnings by removing not accessed variables
      sql/time.cc:
        Fixed wrong DBUG_ASSERT(1)
      storage/maria/unittest/Makefile.am:
        Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
      storage/maria/unittest/ma_pagecache_consist.c:
        Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
      storage/maria/unittest/ma_pagecache_single.c:
        Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
      tests/mysql_client_test.c:
        Fixed compiler warnings by removing not accessed variables and changing types
      dff4e5e1
    • unknown's avatar
      compiler warning fixed · 8654bc4e
      unknown authored
      8654bc4e
    • unknown's avatar
      build/test failures on different platforms · 9e0565f4
      unknown authored
      
      include/atomic/rwlock.h:
        define MY_ATOMIC_MODE_RWLOCKS if this is the way we have to go
      mysys/lf_alloc-pin.c:
        no semicolon
      mysys/lf_hash.c:
        no semicolon
      storage/maria/lockman.c:
        no semicolon
      storage/maria/ma_loghandler.c:
        no semicolon
      unittest/mysys/my_atomic-t.c:
        powerpc is no better
        (condition could be a bit too broad, but hey, it's just a unit test)
      9e0565f4