1. 11 Oct, 2006 1 commit
  2. 10 Oct, 2006 7 commits
    • 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
  3. 09 Oct, 2006 5 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
      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
  4. 08 Oct, 2006 3 commits
  5. 06 Oct, 2006 12 commits
  6. 05 Oct, 2006 11 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
    • unknown's avatar
      BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd · db16cae5
      unknown authored
      smaller patch for 5.0.
      
      complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc
      
      
      ndb/include/mgmapi/mgmapi.h:
        add internal get_fd to use in test
      ndb/include/util/InputStream.hpp:
        - add this weird startover member to SocketInputStream
            - this helps work out if we've read a newline yet and should start inserting
                 into buffer from the start
      ndb/src/common/util/InputStream.cpp:
        remove evil, add more.
        
        keep track internally we've retrieved a newline yet (m_startover)
      ndb/src/common/util/Parser.cpp:
        change way detecting of NoLine
        
        remove some trailing whitespace that was uglying the place up a bit
      ndb/src/common/util/socket_io.cpp:
        Always retrieve data from the OS so that we instantly get EOF on disconnect
        and don't end up spinning looking for a newline.
      ndb/src/mgmapi/mgmapi.cpp:
        add internal ndb_mgm_get_fd() for internal testing
        
        handle 'node status' a bit better
      ndb/test/ndbapi/testMgm.cpp:
        Add test for MgmApiSession disconnection (mgmd at 100%)
        
        not fully automated due to smaller patch for 5.0
        
        will be complete in 5.1
      db16cae5
    • unknown's avatar
      Added license information display to output of plugins schema, and tagged all... · 76cdfbbd
      unknown authored
      Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 
      
      
      include/mysql/plugin.h:
        Adding license information.
      plugin/fulltext/plugin_example.c:
        License
      sql/ha_ndbcluster.cc:
        License
      sql/ha_partition.cc:
        License
      sql/handler.h:
        License
      sql/log.cc:
        License
      sql/sql_show.cc:
        Additional PLUIN display information
      storage/archive/ha_archive.cc:
        License information added
      storage/blackhole/ha_blackhole.cc:
        License information added
      storage/csv/ha_tina.cc:
        License Information
      storage/example/ha_example.cc:
        License information
      storage/federated/ha_federated.cc:
        License Information
      storage/heap/ha_heap.cc:
        License Information
      storage/innobase/handler/ha_innodb.cc:
        License Information
      storage/myisam/ha_myisam.cc:
        License Information
      storage/myisammrg/ha_myisammrg.cc:
        License Information
      76cdfbbd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 83ad64b6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      83ad64b6
  7. 04 Oct, 2006 1 commit