An error occurred fetching the project authors.
  1. 22 Oct, 2006 1 commit
  2. 21 Oct, 2006 1 commit
  3. 20 Oct, 2006 1 commit
    • unknown's avatar
      more post-review fixes - comments, renames, error checks in unit tests · fb818dd7
      unknown authored
      concurrency bug in lock manager
      
      
      include/my_global.h:
        compile-time assert macro
      mysys/my_atomic.c:
        use compile_time_assert() macro
      storage/maria/lockman.c:
        bug in concurrent lockdelete (with retries)
      storage/maria/trnman.c:
        more post-review fixes - comments, renames
      storage/maria/trnman.h:
        more post-review fixes - comments
      storage/maria/unittest/lockman-t.c:
        friendlier error checks
      storage/maria/unittest/trnman-t.c:
        friendlier error checks
      fb818dd7
  4. 19 Oct, 2006 2 commits
  5. 18 Oct, 2006 1 commit
    • unknown's avatar
      lock manager passed unit tests · 12a55aea
      unknown authored
      storage/maria/trnman.c:
        comments
      include/my_dbug.h:
        make DBUG_ASSERT always a statement
      storage/maria/lockman.h:
        comments
      include/lf.h:
        lf_pinbox - don't use a fixed-size purgatory.
      mysys/lf_alloc-pin.c:
        lf_pinbox - don't use a fixed-size purgatory.
      mysys/lf_hash.c:
        lf_pinbox - don't use a fixed-size purgatory.
      storage/maria/lockman.c:
        removed IGNORE_ME/UPGDARED matching - it was wrong in the first place.
        updated for "lf_pinbox - don't use a fixed-size purgatory"
      storage/maria/unittest/lockman-t.c:
        IGNORE_ME/UPGRADED pair counting bugtest.
        more tests
      unittest/mysys/my_atomic-t.c:
        lf_pinbox - don't use a fixed-size purgatory.
      12a55aea
  6. 13 Oct, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 67a2b7cf
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      storage/maria/Makefile.am:
        Auto merged
      storage/maria/ha_maria.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      unittest/Makefile.am:
        Auto merged
      unittest/mysys/my_atomic-t.c:
        merged
      67a2b7cf
    • unknown's avatar
      push for trnman review · c2872baf
      unknown authored
      (lockmanager still fails unit tests)
      
      
      BitKeeper/deleted/.del-Makefile.am~4375ae3d4de2bdf0:
        Delete: unittest/maria/Makefile.am
      configure.in:
        silence up configure warnings, don't generate unittest/maria/Makefile
      include/atomic/nolock.h:
        s/LOCK/LOCK_prefix/
      include/atomic/x86-gcc.h:
        s/LOCK/LOCK_prefix/
      include/atomic/x86-msvc.h:
        s/LOCK/LOCK_prefix/
      include/lf.h:
        pin asserts, renames
      include/my_atomic.h:
        move cleanup
      include/my_bit.h:
        s/uint/uint32/
      mysys/lf_dynarray.c:
        style fixes, split for() in two, remove if()s
      mysys/lf_hash.c:
        renames, minor fixes
      mysys/my_atomic.c:
        run-time assert -> compile-time assert
      storage/maria/Makefile.am:
        lockman here
      storage/maria/unittest/Makefile.am:
        new unit tests
      storage/maria/unittest/trnman-t.c:
        lots of changes
      storage/maria/lockman.c:
        many changes:
        second meaning of "blocker"
        portability: s/gettimeofday/my_getsystime/
        move mutex/cond out of LOCK_OWNER - it creates a race condition
        that will be fixed in a separate changeset
        increment lm->count for every element, not only for distinct ones -
        because we cannot decrease it for distinct elements only :(
      storage/maria/lockman.h:
        move mutex/cond out of LOCK_OWNER
      storage/maria/trnman.c:
        move mutex/cond out of LOCK_OWNER
        atomic-ops to access short_trid_to_trn[]
      storage/maria/trnman.h:
        move mutex/cond out of LOCK_OWNER
      storage/maria/unittest/lockman-t.c:
        unit stress test
      c2872baf
  7. 11 Oct, 2006 1 commit
    • unknown's avatar
      Merge of recent MyISAM changes into Maria. Testsuite passes as much · 0a1dc8af
      unknown authored
      as in the main 5.1 (partition and ndb_alter_table fail).
      
      
      mysql-test/r/maria.result:
        merge from MyISAM
      mysql-test/r/ps_maria.result:
        merge from MyISAM
      mysql-test/t/maria.test:
        merge from MyISAM
      sql/mysql_priv.h:
        fix after wrong merge
      sql/mysqld.cc:
        fix after wrong merge
      sql/set_var.cc:
        adding _db like other engines have
      storage/maria/Makefile.am:
        merge from MyISAM
      storage/maria/ha_maria.cc:
        merge from MyISAM
      storage/maria/ha_maria.h:
        merge from MyISAM
      storage/maria/ma_check.c:
        merge from MyISAM
      storage/maria/ma_delete.c:
        merge from MyISAM
      storage/maria/ma_init.c:
        maria_inited should rather be my_bool
      storage/maria/ma_locking.c:
        merge from MyISAM
      storage/maria/ma_packrec.c:
        merge from MyISAM
      storage/maria/ma_panic.c:
        maria_panic() should not take mutex if engine has not been inited.
      storage/maria/ma_rkey.c:
        merge from MyISAM
      storage/maria/ma_write.c:
        merge from MyISAM
      storage/maria/maria_def.h:
        merge from MyISAM. maria_inited is needed for maria_panic().
      storage/maria/maria_ftdump.c:
        merge from MyISAM
      0a1dc8af
  8. 10 Oct, 2006 8 commits
    • unknown's avatar
      Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean · abdc4682
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-maria
      
      
      BitKeeper/etc/ignore:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      Makefile.am:
        Auto merged
      configure.in:
        Auto merged
      config/ac-macros/plugins.m4:
        Auto merged
      storage/myisammrg/ha_myisammrg.h:
        Auto merged
      unittest/Makefile.am:
        Auto merged
      BitKeeper/triggers/post-commit:
        merge
      include/my_base.h:
        merge
      libmysqld/Makefile.am:
        merge
      mysql-test/mysql-test-run.pl:
        merge
      mysys/Makefile.am:
        merge
      sql/Makefile.am:
        merge
      sql/handler.h:
        merge
      sql/item_func.h:
        merge
      sql/mysql_priv.h:
        merge
      sql/mysqld.cc:
        merge
      sql/set_var.cc:
        merge
      sql/set_var.h:
        merge
      sql/sql_class.h:
        merge
      storage/csv/ha_tina.cc:
        merge
      storage/myisam/Makefile.am:
        merge
      storage/myisam/ha_myisam.cc:
        merge
      storage/myisam/ha_myisam.h:
        merge
      storage/myisam/mi_check.c:
        merge
      storage/myisam/mi_delete.c:
        merge
      storage/myisam/mi_dynrec.c:
        merge
      storage/myisam/mi_packrec.c:
        merge
      storage/myisam/mi_unique.c:
        merge
      storage/myisam/mi_write.c:
        merge
      storage/myisam/myisamdef.h:
        merge
      abdc4682
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · ef0ee764
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      ef0ee764
    • unknown's avatar
      ndb - · ff604cb7
      unknown authored
        ndb_restore Return OK even if temporary errors
          (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
      
      
      storage/ndb/tools/restore/restore_main.cpp:
        Return OK even if temporary errors
      ff604cb7
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · e833ecae
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/r/csv.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/csv.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/innobase/btr/btr0btr.c:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/fsp/fsp0fsp.c:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/innobase/include/btr0cur.ic:
        Auto merged
      storage/innobase/log/log0log.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      storage/innobase/os/os0file.c:
        Auto merged
      storage/innobase/row/row0mysql.c:
        Auto merged
      storage/innobase/row/row0sel.c:
        Auto merged
      storage/innobase/srv/srv0start.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      e833ecae
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 6407b771
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      6407b771
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7037b809
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testTimeout.cpp:
        Auto merged
      7037b809
    • unknown's avatar
      ndb - bug#23107 · 6b4507b9
      unknown authored
        fix bug in test prg
      
      
      6b4507b9
    • unknown's avatar
      ndb - bug#23107 · e486c517
      unknown authored
        fix bug in handling of inactive timeout for scan, when all is delivered
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        1) set timeout if all scans are at api
        2) Use c_appl_timeout_value when getting scan timeout
      ndb/test/ndbapi/testTimeout.cpp:
        test program
      e486c517
  9. 08 Oct, 2006 3 commits
  10. 06 Oct, 2006 12 commits
  11. 05 Oct, 2006 8 commits
    • unknown's avatar
      After merge fix. · 45c91e43
      unknown authored
      45c91e43
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines · 09d77144
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
      
      
      mysql-test/r/ndb_update.result:
        Auto merged
      sql/sql_update.cc:
        Manual merge.
      09d77144
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines · d4b77025
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
      
      
      mysql-test/r/ndb_update.result:
        Auto merged
      mysql-test/t/ndb_update.test:
        Auto merged
      sql/sql_update.cc:
        Manual merge.
      d4b77025
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 9387a593
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
      
      
      9387a593
    • unknown's avatar
      BUG#21381 - Engine not notified about multi-table UPDATE IGNORE · 2268afed
      unknown authored
      Though this is not storage engine specific problem, I was able to
      repeat this problem with BDB and NDB engines only. That was the
      reason to add a test case into ndb_update.test. As a result
      different bad things could happen.
      
      BDB has removed duplicate rows which is not expected.
      NDB returns an error.
      
      For multi table update notify storage engine about UPDATE IGNORE
      as it is done in single table UPDATE.
      
      
      mysql-test/r/ndb_update.result:
        A test case for bug#21381.
      mysql-test/t/ndb_update.test:
        A test case for bug#21381.
      sql/sql_update.cc:
        For multi table update notify storage engine about UPDATE IGNORE
        as it is done in single table UPDATE.
      2268afed
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly · df2042a1
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
      
      Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1
      
      
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/util/InputStream.hpp:
        Auto merged
      storage/ndb/src/common/util/Parser.cpp:
        Auto merged
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/common/util/InputStream.cpp:
        manual merge
      storage/ndb/test/ndbapi/testMgm.cpp:
        manual merge
      df2042a1
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 · 596bf8ec
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
      
      Merge 5.0-ndb into 5.1-ndb
      
      
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_debug.h:
        Auto merged
      storage/ndb/include/util/Parser.hpp:
        Auto merged
      storage/ndb/include/util/socket_io.h:
        Auto merged
      storage/ndb/src/common/util/InputStream.cpp:
        Auto merged
      storage/ndb/src/common/util/Parser.cpp:
        Auto merged
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      storage/ndb/src/cw/cpcd/main.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmclient/main.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/main.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testMgm.cpp:
        Auto merged
      storage/ndb/tools/delete_all.cpp:
        Auto merged
      storage/ndb/tools/drop_index.cpp:
        Auto merged
      storage/ndb/tools/drop_tab.cpp:
        Auto merged
      storage/ndb/tools/listTables.cpp:
        Auto merged
      storage/ndb/tools/select_count.cpp:
        Auto merged
      storage/ndb/tools/waiter.cpp:
        Auto merged
      mysql-test/r/ndb_config.result:
        manual merge
      mysql-test/t/ndb_config.test:
        manual merge
      storage/ndb/include/util/InputStream.hpp:
        manual merge
      storage/ndb/tools/desc.cpp:
        manual merge
      storage/ndb/tools/ndb_condig.cpp:
        manual merge
      storage/ndb/tools/restore/restore_main.cpp:
        manual merge
      storage/ndb/tools/select_all.cpp:
        manual merge
      596bf8ec
    • unknown's avatar
      ndb - bug#17929 · d7bb7cc5
      unknown authored
        guess which scan type to use in handler
      
      
      sql/ha_ndbcluster.cc:
        Add guessing of scan type when starting full-table-scan
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add methods to check properties of a bitmap of columns
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        Add DiskScanFlag
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add aggregate of #disk columns
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Add #disk columns
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Add disk scan flag
      storage/ndb/tools/delete_all.cpp:
        Add tupscan/diskscan to delete_all
      d7bb7cc5