1. 20 Oct, 2006 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a33672a1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      a33672a1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 93fcaa86
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      93fcaa86
    • unknown's avatar
      ndb - · f61e7463
      unknown authored
        Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
      f61e7463
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · feaf57d3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      feaf57d3
    • unknown's avatar
      ndb - · f2742c83
      unknown authored
        Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
      f2742c83
  2. 19 Oct, 2006 7 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 3eaa1078
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      3eaa1078
    • unknown's avatar
      ndb - add temporary tables to hugo · db86570e
      unknown authored
        and use it for testOperations/testTransactions
      
      
      storage/ndb/test/include/NDBT_Test.hpp:
        Add support for temporary tables in hugo
      storage/ndb/test/ndbapi/testOperations.cpp:
        Make testOperations use temporary tables
      storage/ndb/test/ndbapi/testTransactions.cpp:
        Make testTransactions use temporary tables
      storage/ndb/test/src/NDBT_Tables.cpp:
        Add support for temporary tables in hugo
      storage/ndb/test/src/NDBT_Test.cpp:
        Add support for temporary tables in hugo
      db86570e
    • unknown's avatar
      ndb - bug#22672 · 86a34d84
      unknown authored
        fix another incorrect assertion
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        clear m_transaction_nodes.clear()
        to avoid asserion in debug-compiled in releaseApiCon
      86a34d84
    • unknown's avatar
      ndb - fix incorrect assertion · 86cff19c
      unknown authored
        Dont assert when getting gci=0 in read only transaction
      
      
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Dont assert when getting gci=0 in read only transaction
      86cff19c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 21751bd1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        merge
      21751bd1
    • unknown's avatar
      ndb - bug#23200 · c1b1587f
      unknown authored
        this changes lock taken during peek, to decrease likelyhood of transaction abort
        
      
      
      sql/ha_ndbcluster.cc:
        use exclusive lock in peek, as peek is used just before insert/update
      c1b1587f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c34825bf
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      c34825bf
  3. 18 Oct, 2006 9 commits
    • unknown's avatar
      ndb - bug#23430 · 6ea01baf
      unknown authored
        make sure not to release log buffer twice (or several times) in case of abort of multi update
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
        make sure not to release log buffer twice (or several times) in case of abort of multi update
      6ea01baf
    • unknown's avatar
      ndb - bug#23200 · 313b46da
      unknown authored
        Make sure postExecute is not run for blobs if AO_IgnoreError
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        If AO_IgnoreError, error codes arent always set on individual operations, making postExecute impossible
      313b46da
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · f99ef077
      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
      f99ef077
    • unknown's avatar
      BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · e5a79d41
      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.
      e5a79d41
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 21697182
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
      
      21697182
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · fa11af29
      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
      fa11af29
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge · 4dd7833d
      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
      4dd7833d
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 26bb1773
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
      
      26bb1773
    • unknown's avatar
      Bug #19148 Backup causes cluster down if _really_ early abort happens · 8aab3397
      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
      8aab3397
  4. 17 Oct, 2006 4 commits
  5. 16 Oct, 2006 13 commits
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · fc6b48b9
      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
      fc6b48b9
    • unknown's avatar
      ndb - replace explain 'rows' by '#' in ndb*.test - stats are not deterministic · 10b4ae8d
      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
      10b4ae8d
    • unknown's avatar
      Bug #21072 Duplicate key error in NDB references wrong key: Added new... · 04d124c3
      unknown authored
       Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
      
      
      04d124c3
    • unknown's avatar
      Bug #21072 Duplicate key error in NDB references wrong key: Added new... · 369ec454
      unknown authored
       Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
      
      
      369ec454
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 00a2e767
      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
      00a2e767
    • unknown's avatar
    • unknown's avatar
      Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb · 675e15a5
      unknown authored
      into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
      
      675e15a5
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 80eec8ba
      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
      80eec8ba
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 6a591636
      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
      6a591636
    • unknown's avatar
      BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · 41c4474a
      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
      41c4474a
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 · c25b4d58
      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
      c25b4d58
    • unknown's avatar
      BUG#21253 NdbApi.h should not include my_config.h · 476a1a24
      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
      476a1a24
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0d3ab809
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      0d3ab809
  6. 15 Oct, 2006 1 commit
  7. 13 Oct, 2006 1 commit
    • unknown's avatar
      DictTabInfo.cpp: · 487cad4e
      unknown authored
        Fix for bug#23169 - memset param switching
      
      
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Fix for bug#23169 - memset param switching
      487cad4e