1. 13 Oct, 2006 2 commits
  2. 12 Oct, 2006 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 38edc8ad
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      38edc8ad
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 38910a86
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      38910a86
    • unknown's avatar
      ndb - missing if for bug#21941 · 2acf07aa
      unknown authored
        note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        missing if for bug#21941
      2acf07aa
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4d0b2435
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        merge
      4d0b2435
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 2f3ac777
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/ERROR_codes.txt:
        merge
      2f3ac777
    • unknown's avatar
      ndb - bug#23210 · 855c4e06
      unknown authored
        Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd
        Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self"
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Add error insert for dealying of copy sysfileData
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        1) Add error insert for delaying of sysfileData
        2) Change to that master is _not_ copying sysfileData from COPY_GCIREQ
           as it might be updating it while COPY_GCIREQ is "in the fly"
      855c4e06
  3. 11 Oct, 2006 6 commits
    • unknown's avatar
      Raise version number · 16f2de1d
      unknown authored
      16f2de1d
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4d46af65
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      4d46af65
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-rpl · 12e09c02
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      12e09c02
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-rpl · 4fc50652
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      4fc50652
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4bd33a0d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      BitKeeper/etc/collapsed:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      4bd33a0d
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · e1f52e72
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
      
      
      e1f52e72
  4. 10 Oct, 2006 14 commits
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · c34940a0
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      c34940a0
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · 687f44fe
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      687f44fe
    • 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 romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 3f3ffdcc
      unknown authored
      into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl
      
      
      sql/log_event.cc:
        Auto merged
      3f3ffdcc
    • unknown's avatar
      BUG#21474 (There is a rotation before the last table map): · 55ce4471
      unknown authored
      Removing code to step the group log position and just stepping
      the event log position.  If the group log position were stepped
      one time too many, it might be that the group starts at a position
      that is not possible, e.g., at a Rows_log_event, or between an
      Intvar_log_event and the following associated Query_log_event.
      
      
      sql/log_event.cc:
        Removing code to step the group log position and just stepping
        the event log position.  If the group log position were stepped
        one time too many, it might be that the group starts at a position
        that is not possible, e.g., at a Rows_log_event, or between an
        Intvar_log_event and the following associated Query_log_event.
      sql/slave.cc:
        Removing code to step the group log position and just stepping
        the event log position when executing a Format_description_log_event.
        If the group log position were stepped one time too many, it might be that the group starts at a position
        that is not possible, e.g., at a Rows_log_event, or between an
        Intvar_log_event and the following associated Query_log_event.
      55ce4471
    • unknown's avatar
      Fixes to make replication team tree build on Windows. · 010edb7e
      unknown authored
      
      sql/log_event.cc:
        Adding casts to make it compile on Windows.
      010edb7e
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · ffa6c020
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      ffa6c020
    • unknown's avatar
      Fix to make it build on all platforms. · 95d29d0d
      unknown authored
      Replacing C++ code with C code in a C file.
      
      
      mysys/mf_iocache2.c:
        There shall not be C++ code in C files.
      95d29d0d
    • 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
  5. 09 Oct, 2006 6 commits
    • unknown's avatar
      ndb - tux scan 5.1 post-merge fix · 9fceb877
      unknown authored
      9fceb877
    • unknown's avatar
      Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 · a667710f
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
      
      
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        merge: manual
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
        SCCS merged
      a667710f
    • unknown's avatar
      ndb - bug#20446: fix + other TUX scan improvements · eb97edf4
      unknown authored
      
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
        fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
      eb97edf4
    • unknown's avatar
      Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 · c254a9cc
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
      
      
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        SCCS merged
      storage/ndb/test/ndbapi/testOIBasic.cpp:
        merge: ur
      storage/ndb/test/run-test/daily-basic-tests.txt:
        SCCS merged
      c254a9cc
    • unknown's avatar
      Post-merge fixes. · 45c30c7f
      unknown authored
      
      mysql-test/t/view.test:
        Switching to using symbolic error numbers instead of numbers.
        Using numbers caused test to fail.
      45c30c7f
    • unknown's avatar
      ndb - bug#20446: test case and cleanups (not fix) · a82f6781
      unknown authored
      
      ndb/test/ndbapi/testOIBasic.cpp:
        test -case h for parallel ordered update (bug#20446)
      ndb/test/run-test/daily-basic-tests.txt:
        test -case h for parallel ordered update (bug#20446)
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        remove stupid Data abstraction which is not completely transparent
      ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
        remove stupid Data abstraction which is not completely transparent
      ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        remove stupid Data abstraction which is not completely transparent
      a82f6781
  6. 08 Oct, 2006 5 commits
  7. 06 Oct, 2006 1 commit
    • unknown's avatar
      ndb - bug#22893 · 311abf10
      unknown authored
        Add checking of REDO to earlier during SR
            so take-over of node can be performed
            if it can't be restarted using logs
            (which btw is really weird...as it _should_ be able to use logs of other node in node group)
      
        Otherwise cluster could be started and 1 fragment on one node could not have been restored
        Making the cluster inconsisten, VERY BAD
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Break-out methods which searches for REDO for a fragment, so it can be used earlier during SR
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Add checking of REDO to earlier during SR
          so take-over of node can be performed
          if it can't be restarted using logs
          (which btw is really weird...as it _should_ be able to use logs of other node in node group)
      311abf10