1. 12 Oct, 2006 4 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6b041b49
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      6b041b49
    • 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/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
  2. 11 Oct, 2006 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · d049ec4a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      sql/ha_ndbcluster.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
      d049ec4a
    • 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
  3. 10 Oct, 2006 6 commits
  4. 08 Oct, 2006 3 commits
  5. 06 Oct, 2006 9 commits
  6. 05 Oct, 2006 6 commits
    • 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
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · 66fbc60d
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly
      
      
      ndb/include/mgmapi/mgmapi.h:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      66fbc60d
    • 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
      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
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8f332252
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt
      
      
      8f332252
  7. 04 Oct, 2006 2 commits
    • unknown's avatar
      ndb - bug#22892 · 0693c238
      unknown authored
          Make sure checkKeepGci is also run on oldStoredReplicas
            to prevent keepgci to move backwards when crash node restarts
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Make sure checkKeepGci is also run on oldStoredReplicas
          to prevent keepgci to move backwards when crash node restarts
      0693c238
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb-bj · d8730c3a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/include/mgmapi/mgmapi.h:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      ndb/include/ndb_version.h.in:
        merge
      d8730c3a
  8. 03 Oct, 2006 8 commits