1. 17 Jan, 2006 12 commits
    • unknown's avatar
      fix compile error · 6aa4cded
      unknown authored
      6aa4cded
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 513a523b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      513a523b
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8d7692d3
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      8d7692d3
    • unknown's avatar
    • unknown's avatar
      Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new · e77bd2be
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
      
      
      e77bd2be
    • unknown's avatar
      f4600b1f
    • unknown's avatar
      Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new · db30c09c
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      db30c09c
    • unknown's avatar
    • unknown's avatar
      WL #2747: Fix such that backup and restore works for user defined · 6f83ed91
      unknown authored
      partitioned tables in NDB
      
      
      include/my_sys.h:
        Move packfrm and unpackfrm to mysys
      mysql-test/r/ndb_restore.result:
        New test cases
      mysql-test/t/ndb_restore.test:
        New test cases
      mysys/my_compress.c:
        Moved packfrm and unpackfrm to mysys
      sql/ha_ndbcluster.cc:
        Set value of partition function in hidden field for user defined
        partitioning in NDB to handle restore and later on-line reorganize
        of partitions
        To save space value of those functions are limited to 32 bits
      sql/ha_partition.cc:
        Use new get_partition_id interface
      sql/handler.h:
        Use new get_partition_id interface
      sql/mysql_priv.h:
        Moved to mysys
      sql/mysqld.cc:
        Minor
      sql/opt_range.cc:
        New get_partition_id interface
      sql/sql_partition.cc:
        New get_partition_id interface
        Fix error checks of specification of engines in ALTER TABLE
        Moved packfrm and unpackfrm to mysys
      sql/sql_table.cc:
        Fixed debug printouts
      storage/ndb/include/kernel/ndb_limits.h:
        New constant
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        New table description item
      storage/ndb/include/ndb_version.h.in:
        New version specific constant
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        New item in table descriptions
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        New item in table descriptions
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Write fragment id in backup's log entry
      storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Write fragment id in backup's log entry
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        New item in table description
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        New item in table description
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Moved constant
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        New item in table description
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        New item in table description
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        New item in table description
      storage/ndb/tools/Makefile.am:
        Compress library needed for ndb_restore
      storage/ndb/tools/restore/Restore.cpp:
        Handle fragment id and also handle backups from older versions
      storage/ndb/tools/restore/Restore.hpp:
        Use fragment id
      storage/ndb/tools/restore/consumer.hpp:
        Use fragment id
      storage/ndb/tools/restore/consumer_printer.cpp:
        Use fragment id
      storage/ndb/tools/restore/consumer_printer.hpp:
        Use fragment id
      storage/ndb/tools/restore/consumer_restore.cpp:
        Code to map node groups if new cluster has different set of
        node groups from original cluster
        Very simple search and replace parser of partition syntax in frm file
        Fix settings of partition id properly using fragment id and hidden
        field in tables
      storage/ndb/tools/restore/consumer_restore.hpp:
        Changed function headers and new one for mapping node groups
      storage/ndb/tools/restore/consumer_restorem.cpp:
        Use fragment id
      storage/ndb/tools/restore/restore_main.cpp:
        New parameter to set node group map, parser for this parameter
      6f83ed91
    • unknown's avatar
      WL #2604: Partition Management · 19bbb7cc
      unknown authored
      Optimised version of ADD/DROP/REORGANIZE partitions for
      non-NDB storage engines.
      New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
      Quite a few bug fixes
      
      
      include/thr_lock.h:
        New method to downgrade locks from TL_WRITE_ONLY
        Possibility to upgrade lock while aborting locks
      mysql-test/r/ndb_autodiscover.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_bitfield.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_gis.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_partition_key.result:
        New test case
      mysql-test/r/partition.result:
        New test case
      mysql-test/r/partition_error.result:
        New test case
      mysql-test/r/partition_mgm_err.result:
        Fix of test case results
      mysql-test/t/disabled.def:
        partition_03ndb still has bug
      mysql-test/t/ndb_partition_key.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition_error.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition_mgm_err.test:
        New test cases for new functionality and bugs
      mysys/thr_lock.c:
        New method to downgrade TL_WRITE_ONLY locks
        Possibility to specify if locks are to be upgraded at abort locks
      sql/ha_archive.cc:
        New handlerton methods
      sql/ha_berkeley.cc:
        New handlerton methods
      sql/ha_blackhole.cc:
        New handlerton methods
      sql/ha_federated.cc:
        New handlerton methods
      sql/ha_heap.cc:
        New handlerton methods
      sql/ha_innodb.cc:
        New handlerton methods
      sql/ha_myisam.cc:
        New handlerton methods
      sql/ha_myisammrg.cc:
        New handlerton methods
      sql/ha_ndbcluster.cc:
        New handlerton methods
        Moved out packfrm and unpackfrm methods
        Adapted many parts to use table_share instead of table->s
        Ensured that .ndb file uses filename and not tablename
        according to new encoding of names (WL 1324)
        All NDB tables are partitioned and set up partition info
        Fixed such that tablenames use tablenames and not filenames in NDB
        NDB uses auto partitioning for ENGINE=NDB tables
        Warning for very large tables
        Set RANGE data
        Set LIST data
        New method to set-up partition info
        Set Default number of partitions flag
        Set linear hash flag
        Set node group array
        Set number of fragments
        Set max rows
        Set tablespace names
        New method to get number of partitions of table to use at open table
      sql/ha_ndbcluster.h:
        Removed partition_flags and alter_table_flags from handler class
        A couple of new and changed method headers
      sql/ha_ndbcluster_binlog.cc:
        Use new method headers
      sql/ha_partition.cc:
        New handlerton methods
        Lots of new function headers
        Use #P# as separator between table name and partition name and
        #SP# as separator between partition name and subpartition name
        Use filename encoding for files both of table name part and of
        partition name parts
        New method to drop partitions based on partition state
        New method to rename partitions based on partition state
        New methods to optimize, analyze, check and repair partitions
        New methods to optimize, analyze, check and repair table
        Helper method to create new partition, open it and external lock
        it, not needed to lock it internally since no one else knows about
        it yet.
        Cleanup method at error for new partitions
        New methods to perform bulk of work at ADD/REORGANIZE partitions
        (change_partitions, copy_partitions)
      sql/ha_partition.h:
        New methods and variables
        A few dropped ones and a few changed ones
      sql/handler.cc:
        Handlerton interface changes
        New flag to open_table_from_share
      sql/handler.h:
        New alter_table_flags
        New partition flags
        New partition states
        More states for default handling
        Lots of new, dropped and changed interfaces
      sql/lex.h:
        Added REBUILD and changed name of REORGANISE to REORGANIZE
      sql/lock.cc:
        Method to downgrade locks
        Able to specify if locks upgraded on abort locks
      sql/log.cc:
        New handlerton methods
      sql/mysql_priv.h:
        Lots of new interfaces
      sql/share/errmsg.txt:
        Lots of new, dropped and changed error messages
      sql/sql_base.cc:
        Adapted to new method headers
        New method to abort and upgrade lock
        New method to close open tables and downgrade lock
        New method to wait for completed table
      sql/sql_lex.h:
        New flags
      sql/sql_partition.cc:
        Return int instead of bool in get_partition_id
        More defaults handling
        Make use of new mem_alloc_error method
        More work on function headers
        Changes to generate partition syntax to cater for intermediate
        partition states
        Lots of new code with large comments describing new features for
        Partition Management:
        ADD/DROP/REORGANIZE/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
      sql/sql_show.cc:
        Minors
      sql/sql_table.cc:
        Moved a couple of methods
        New methods to copy create lists and key lists
        for use with mysql_prepare_table
        New method to write frm file
        New handling of handlers with auto partitioning
        Fix CREATE TABLE LIKE
        Moved code for ADD/DROP/REORGANIZE partitions
        Use handlerton method for alter_table_flags
      sql/sql_yacc.yy:
        More memory alloc error checks
        New syntax for REBUILD, ANALYZE, CHECK, OPTIMIZE, REPAIR partitions
      sql/table.cc:
        Fix length of extra part to be 4 bytes
        Partition state introduced in frm file
      sql/table.h:
        Partition state introduced
      sql/unireg.cc:
        Partition state introduced
        Default partition
      storage/csv/ha_tina.cc:
        New handlerton methods
      storage/example/ha_example.cc:
        New handlerton methods
      storage/ndb/include/kernel/ndb_limits.h:
        RANGE DATA
      storage/ndb/include/kernel/signaldata/AlterTable.hpp:
        New interfaces in ALTER TABLE towards NDB kernel
      storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
        New section
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Lots of new parts of table description
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
        tablespace id specified in LQHFRAGREQ
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Lots of new methods in NDB dictionary
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        New error insertion
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        a few extra jam's
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Changes to definition of blob tables
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/test/ndbapi/test_event.cpp:
        removed use of methods no longer in existence
      storage/ndb/tools/restore/Restore.cpp:
        Renamed variable
      19bbb7cc
    • unknown's avatar
      added option to run all ndb tests only · 6f962fc6
      unknown authored
      6f962fc6
    • unknown's avatar
      added assert for when ndb share is not released as it should · ed96f708
      unknown authored
      + corrected the bugs in this resuling from mysql-test-run
      +removed some debug printouts
      
      
      sql/ha_ndbcluster.cc:
        added assert for when ndb share is not released as it should
        + corrected the bugs in this resuling from mysql-test-run
      sql/ha_ndbcluster.h:
        added assert for when ndb share is not released as it should
        + corrected the bugs in this resuling from mysql-test-run
      sql/ha_ndbcluster_binlog.cc:
        added assert for when ndb share is not released as it should
        + corrected the bugs in this resuling from mysql-test-run
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        removed some debug printouts
      ed96f708
  2. 16 Jan, 2006 11 commits
  3. 15 Jan, 2006 5 commits
    • unknown's avatar
      ndb - fix ndb_restore on solaris · 0a5a8a51
      unknown authored
        Fix alignment changes in tup page header
      
      
      storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
        Fix alignment changes in tup page header
      storage/ndb/src/kernel/blocks/suma/Suma.hpp:
        Fix alignment changes in tup page header
      0a5a8a51
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb · ec67a6a3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-new
      
      
      ec67a6a3
    • unknown's avatar
      ndb dd - · ebf57797
      unknown authored
        Change default page buffer cache size
      
      
      mysql-test/ndb/ndb_config_1_node.ini:
        Add configuration of page buffer
      mysql-test/ndb/ndb_config_2_node.ini:
        Add configuration of page buffer
      mysql-test/ndb/ndb_config_4_node.ini:
        Add configuration of page buffer
      mysql-test/ndb/ndbcluster.sh:
        Add configuration of page buffer
      storage/ndb/include/kernel/ndb_limits.h:
        Hard code some limits (for now)...
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        Add configuration of page buffer
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Add configuration of page buffer
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Add configuration of page buffer
      storage/ndb/src/kernel/blocks/restore.cpp:
        Add configuration of page buffer
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Change default page buffer caches from 1M (only used for testing) to realistic 64M
      ebf57797
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1d5a5ae0
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.1-studio
      
      
      sql/log_event.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      1d5a5ae0
    • unknown's avatar
      Changes to avoid compilation errors in MS Visual Studio 7.1 · 8e9cabb1
      unknown authored
       (reviewed by Mats)
      
      
      sql/log_event.cc:
        Changes to avoid compilation errors in MS Visual Studio 7.1
      sql/sql_class.cc:
        Changes to avoid compilation errors in MS Visual Studio 7.1
      8e9cabb1
  4. 14 Jan, 2006 1 commit
    • unknown's avatar
      Solaris compile fixes. · eade034f
      unknown authored
      
      sql/handler.cc:
        Fix missing return value, caused Solaris compile failure.
      eade034f
  5. 13 Jan, 2006 11 commits
    • unknown's avatar
      BUG#14194: Problem with fulltext boolean search and apostrophe · ca4935e6
      unknown authored
      Fixed that single apostrophe was considered as a word character.
      
      
      mysql-test/r/fulltext.result:
        A test case for BUG#14194 added.
      mysql-test/t/fulltext.test:
        A test case for BUG#14194 added.
      storage/myisam/ftdefs.h:
        Fixed that single apostrophe was considered as a word character.
      ca4935e6
    • unknown's avatar
      BUG#13835: max key length is 1000 bytes when trying to create a fulltext index · 7f397ffd
      unknown authored
      Allow fulltext index on VARCHAR columns longer than max key length.
      
      
      mysql-test/r/fulltext.result:
        A test case for BUG#13835 added.
      mysql-test/t/fulltext.test:
        A test case for BUG#13835 added.
      sql/sql_table.cc:
        Allow fulltext index on VARCHAR columns longer than max key length.
      7f397ffd
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b358c5cb
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      b358c5cb
    • unknown's avatar
      ndb - wl#2972 event merge false by default => change option name · 0953c40f
      unknown authored
      
      storage/ndb/include/ndbapi/NdbEventOperation.hpp:
        event merge false by default => change option name
      storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp:
        event merge false by default => change option name
      storage/ndb/src/ndbapi/NdbEventOperation.cpp:
        event merge false by default => change option name
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        event merge false by default => change option name
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        event merge false by default => change option name
      storage/ndb/test/ndbapi/test_event.cpp:
        event merge false by default => change option name
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        event merge false by default => change option name
      0953c40f
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103 · 32944ad2
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-tree
      
      
      include/config-win.h:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/rpl_ddl.result:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      32944ad2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · d3f0247e
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
      
      
      mysql-test/t/disabled.def:
        Auto merged
      d3f0247e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 83d48914
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      83d48914
    • unknown's avatar
      fix compile error on hp-ux setenv->putenv · c3c21b70
      unknown authored
         print slave port as well
      
      
      client/mysqltest.c:
        fix compile error on hp-ux setenv->putenv
      mysql-test/mysql-test-run.sh:
        print slave port as well
      c3c21b70
    • unknown's avatar
      Merge BUG#15110 from 5.0 into 5.1. · 848235f7
      unknown authored
      Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
      into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqldump.c:
        Auto merged
      include/mysql_com.h:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/type_time.result:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      client/Makefile.am:
        Add my_user.c
      include/Makefile.am:
        Add my_user.c
      libmysqld/Makefile.am:
        Add my_user.c
      mysql-test/t/disabled.def:
        Enable type_time.test
      sql/sql_parse.cc:
        Merge.
      848235f7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 85f2158b
      unknown authored
      into moonbone.local:/work/15347-bug-5.0-mysql
      
      
      85f2158b
    • unknown's avatar
      Merge · 7eb0f577
      unknown authored
      
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      mysql-test/t/select.test:
        SCCS merged
      7eb0f577