1. 18 Oct, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 0fa984e4
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      mysql-test/r/ndb_charset.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      0fa984e4
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · c2e8969a
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
      
      
      c2e8969a
    • unknown's avatar
      Bug #19148 Backup causes cluster down if _really_ early abort happens · 7968c44c
      unknown authored
      Early abort, failing to allocate buffers, would go down the abort track and
       end up trying to sendDropTriggers (as the standard stop backup does). 
      However, it is possible to not have any tables yet defined in the backup 
      (due to allocating buffers is before this). Simple check in sendDropTrig 
      (and continue to next step). Files may be open, so we continue to close them.
      
      Also updated ERROR_Codes (and added one to test this bug).
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        update BACKUP error insert codes to reflect current reality.
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Allow for early abort when no tables have been included in backup.
        
        Allow for abort when file records have been seized but not yet allocated
        to specific uses (is the case when buffer allocation fails)
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        initialize BackupRecord file Ptrs
      storage/ndb/test/src/NdbBackup.cpp:
        Add extra failure codes for buffer allocation failure in backup
      7968c44c
  2. 17 Oct, 2006 4 commits
  3. 16 Oct, 2006 11 commits
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · e1ff81bb
      unknown authored
      into  dator5.(none):/home/pappa/bug18198
      
      
      mysql-test/r/partition.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/partition_info.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_partition.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/item_cmpfunc.h:
        e
      e1ff81bb
    • unknown's avatar
      ndb - replace explain 'rows' by '#' in ndb*.test - stats are not deterministic · 1e55b8dd
      unknown authored
      
      mysql-test/r/ndb_basic.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/r/ndb_blob.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/r/ndb_charset.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/r/ndb_condition_pushdown.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/r/ndb_dd_sql_features.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/r/ndb_subquery.result:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_basic.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_blob.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_charset.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_condition_pushdown.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_dd_sql_features.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      mysql-test/t/ndb_subquery.test:
        replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
      1e55b8dd
    • unknown's avatar
      Bug #21072 Duplicate key error in NDB references wrong key: Added new... · 64e9cd5b
      unknown authored
       Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
      
      
      
      64e9cd5b
    • unknown's avatar
      Bug #21072 Duplicate key error in NDB references wrong key: Added new... · a95a9fea
      unknown authored
       Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
      
      
      
      a95a9fea
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · f0161aac
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      mysql-test/r/ndb_charset.result:
        Using local, will re-generate
      mysql-test/r/ndb_index_unique.result:
        Using local, will re-generate
      f0161aac
    • unknown's avatar
    • unknown's avatar
      Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb · afc81b7e
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
      
      
      afc81b7e
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · b19aabd8
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      mysql-test/r/ndb_charset.result:
        Usin g local, will re-generate.
      mysql-test/r/ndb_index_unique.result:
        Using local, will re-generate
      mysql-test/r/ndb_update.result:
        Using local, will re-generate
      sql/ha_ndbcluster.cc:
        Merge
      sql/handler.cc:
        Merge
      b19aabd8
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 8a88e57c
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      mysql-test/r/ndb_charset.result:
        Auto merged
      mysql-test/r/ndb_index_unique.result:
        Auto merged
      mysql-test/r/ndb_update.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Merg
      sql/handler.cc:
        Merge
      8a88e57c
    • unknown's avatar
      BUG#21253 NdbApi.h should not include my_config.h · 4154eb9a
      unknown authored
      
      config/ac-macros/ha_ndbcluster.m4:
        re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
        which causes problems for autotools enabled ndbapi programs
      storage/ndb/include/ndb_types.h.in:
        remove dependency on my_config.h that was causing problems for ndbapi programs
        using autoconf
      4154eb9a
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0079ce3b
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      0079ce3b
  4. 15 Oct, 2006 1 commit
  5. 13 Oct, 2006 5 commits
  6. 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
  7. 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
  8. 10 Oct, 2006 4 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