1. 27 Jun, 2006 13 commits
    • unknown's avatar
      54a05151
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5861497b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      5861497b
    • unknown's avatar
      7641c7ae
    • unknown's avatar
      rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: · 0e0316e9
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/r/rpl_ndb_dd_partitions.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/rpl_ndb_dd_partitions.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      0e0316e9
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · 99b67e68
      unknown authored
      into  mysql.com:/data0/mysql-5.1
      
      99b67e68
    • unknown's avatar
      Many files: · 09442a55
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/t/ndb_partition_error.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_key.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_list.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_range.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_blob_partition.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_dd_backuprestore.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_error.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_key.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_list.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_range.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_blob_partition.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_dd_backuprestore.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      09442a55
    • unknown's avatar
      changed signature of get_default_no_partitions · eb0c6dda
      unknown authored
      eb0c6dda
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · d73dca8f
      unknown authored
      - post merge fixes for 5.1
      
      d73dca8f
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 33616fb9
      unknown authored
      - post merge fixes for 5.1
      
      33616fb9
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 29a0ef46
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      29a0ef46
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 40f9f83d
      unknown authored
      - correction of previous patch
      
      40f9f83d
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 79c6d94f
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/TupFrag.hpp:
        manual merge
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        manual merge
      storage/ndb/tools/restore/Restore.cpp:
        manual merge
      storage/ndb/tools/restore/Restore.hpp:
        manual merge
      storage/ndb/tools/restore/consumer_restore.cpp:
        manual merge
      79c6d94f
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 6f0bbc51
      unknown authored
      - make sure to allocate just enough pages in the fragments by using the actual
        row count from the backup, to avoid over allocation of pages to fragments, and
        thus avoid the bug
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - distribute fragment complete to all participants to update row count
      ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - time slica writing of fragment info to ctl file
      ndb/include/kernel/signaldata/BackupImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
        - new signal fragment complete to all participants
      ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add min and max rows to dict tab info
      ndb/include/kernel/signaldata/LqhFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/kernel/signaldata/TupFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/ndbapi/NdbDictionary.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added get/set of min max rows
      ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to dict tab info
      ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new signal fragment complete to all participants
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
        - move memory allocation to fragment to after adding of attributes to get correct headsize
        - allocate pages to fragments according to min rows setting
      ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - grow page allocation starting from 2 irrespective of first page allocation
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/ndbapi/NdbDictionary.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/tools/restore/Restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/Restore.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/consumer_restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min in restore to the actual row count (this is the actual bug fix)
      sql/ha_ndbcluster.cc:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min and max rows according to sql definition
      6f0bbc51
  2. 26 Jun, 2006 11 commits
  3. 25 Jun, 2006 4 commits
    • unknown's avatar
      Post merge fix · 4029c475
      unknown authored
      
      mysql-test/r/func_time.result:
        post-merge fix
      mysql-test/r/select.result:
        post-merge fix
      4029c475
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge · 0a71088e
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/valgrind.supp:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      include/Makefile.am:
        manual merge
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/select.result:
        manual merge
      0a71088e
    • unknown's avatar
      .del-make_win_src_distribution.sh~f80d8fca44e4e5f1: · ffe4fad9
      unknown authored
        Delete: scripts/make_win_src_distribution.sh
      Makefile.am:
        Unix and Windows now shares source package
      
      
      scripts/Makefile.am:
        Unix and Windows now shares source package
      BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
        Delete: scripts/make_win_src_distribution.sh
      ffe4fad9
    • unknown's avatar
      BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'. · 3b670b98
      unknown authored
      Start test case with a dummy table create and drop. This ensures that
      NDB event subscription is properly set up before the real test starts,
      which otherwise could sometimes cause INSERT events to be lost.
      
      
      mysql-test/r/ndb_binlog_multi.result:
        Start test with dummy table create/drop to avoid a race.
      mysql-test/t/ndb_binlog_multi.test:
        Start test with dummy table create/drop to avoid a race.
      3b670b98
  4. 24 Jun, 2006 4 commits
  5. 23 Jun, 2006 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 3302f3dd
      unknown authored
      into  mysql.com:/data0/knielsen/tmp-5.1
      
      3302f3dd
    • unknown's avatar
      Post merge fix. · 961a272c
      unknown authored
      961a272c
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge · 287a89a0
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/lock_multi.result:
        manual merge
      mysql-test/t/lock_multi.test:
        manual merge
      sql/ha_innodb.cc:
        manual merge
      287a89a0
    • unknown's avatar
      Fix for bug #18897 "Events: unauthorized action possible with · 2b276ab2
      unknown authored
      alter event rename".
      
      ALTER EVENT ... RENAME statement hasn't checked privileges
      for the target database. It also caused server crashes when
      target database was not specified explicitly and there was
      no current database.
      
      This fix adds missing privilege check and check for the case
      when target database is not specified explicitly or implicitly.
      
      
      mysql-test/r/events_bugs.result:
        update result
      mysql-test/t/events_bugs.test:
        add test case for bug 18897 Events: unauthorized action possible with alter event
        rename:
        - test rename to db the user does not have access to
        - test rename when there is no selected db
      sql/sql_parse.cc:
        Additional check for the situation when no db is selected.
        CREATE EVENT abc and ALTER EVENT db.abc RENAME TO xyz,
        and DROP EVENT abc
        won't work if there is no selected DB.
      2b276ab2
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · f8da71fc
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug
      
      f8da71fc
    • unknown's avatar
      remove links from bk to get rid of warnings on windows · 3613b8bc
      unknown authored
      
      BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
        Delete: server-tools/instance-manager/sql_state.c
      BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
        Delete: server-tools/instance-manager/password.c
      BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
        Delete: server-tools/instance-manager/pack.c
      BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
        Delete: server-tools/instance-manager/net_serv.cc
      3613b8bc
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 · 888be349
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.1
      
      
      server-tools/instance-manager/instance_options.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/rpl_injector.cc:
        Auto merged
      sql/rpl_injector.h:
        Auto merged
      888be349
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622 · e9069146
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
      
      
      mysys/mf_dirname.c:
        Auto merged
      server-tools/instance-manager/instance_options.cc:
        Manual merge.
      e9069146