1. 19 Oct, 2006 1 commit
    • unknown's avatar
      Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux · 5dd4481d
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
      
      
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        SCCS merged
      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/DbtuxScan.cpp:
        SCCS merged
      storage/ndb/src/kernel/vm/DLFifoList.hpp:
        maybe already-done-merge
      5dd4481d
  2. 18 Oct, 2006 7 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · bb06ec21
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      bb06ec21
    • unknown's avatar
      BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · 81b19542
      unknown authored
      update partition engine for handler::info returning int
      
      
      sql/ha_partition.cc:
        update for handler::info returning int.
      sql/ha_partition.h:
        update for handler::info returning int.
      81b19542
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 24584808
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
      
      
      24584808
    • 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.0/bug19914-mk2-merge · 9910031c
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
      
      
      BitKeeper/deleted/.del-ha_berkeley.cc:
        Auto merged
      BitKeeper/deleted/.del-ha_berkeley.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/blackhole/ha_blackhole.cc:
        Auto merged
      storage/blackhole/ha_blackhole.h:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/csv/ha_tina.h:
        Auto merged
      storage/example/ha_example.cc:
        Auto merged
      storage/example/ha_example.h:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/federated/ha_federated.h:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/heap/ha_heap.h:
        Auto merged
      storage/myisam/ha_myisam.h:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/ndb_version.h.in:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmclient/main.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/tools/ndb_condig.cpp:
        Auto merged
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        merge
      sql/ha_ndbcluster.h:
        merge
      sql/handler.h:
        merge
      sql/sql_delete.cc:
        merge
      storage/archive/ha_archive.h:
        merge
      storage/innobase/handler/ha_innodb.cc:
        merge
      storage/innobase/handler/ha_innodb.h:
        merge
      storage/myisam/ha_myisam.cc:
        merge
      storage/myisammrg/ha_myisammrg.h:
        merge
      9910031c
    • 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
  3. 17 Oct, 2006 4 commits
  4. 16 Oct, 2006 13 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#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · 46152464
      unknown authored
      update federated for fix
      
      
      sql/ha_federated.cc:
        update federated for ::info returning int
      sql/ha_federated.h:
        update federated for ::info returning int
      46152464
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 · 62689e18
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
      
      
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_archive.h:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_blackhole.h:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_heap.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisam.h:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_example.h:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        merge
      sql/ha_ndbcluster.h:
        merge
      sql/handler.h:
        merge
      sql/sql_select.cc:
        merge
      62689e18
    • 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
  5. 15 Oct, 2006 1 commit
  6. 13 Oct, 2006 7 commits
  7. 12 Oct, 2006 7 commits