1. 20 Jan, 2006 13 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 59206da1
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      59206da1
    • unknown's avatar
      option to run mysql-test-run without binlog · ba315e9b
      unknown authored
      calculate ndbcluster slave port
      
      
      mysql-test/mysql-test-run.pl:
        calculate ndbcluster slave port
      mysql-test/mysql-test-run.sh:
        option to run mysql-test-run without binlog
      sql/mysqld.cc:
        option to run mysql-test-run without binlog
      ba315e9b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · f3989fed
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      f3989fed
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-new · 3da63810
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      sql/sql_class.cc:
        Auto merged
      3da63810
    • unknown's avatar
      Portability compilation fixes. · e3523a0f
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Fix sol10-amd64-a compile failure, conflict with system headers.
      sql/log.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/mysql_priv.h:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/sql_delete.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/table.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/sql_parse.cc:
        Fix HPUX compile failure, initializing char * with const char *
      e3523a0f
    • unknown's avatar
      Back out errorneous Windows fix. · e4cae610
      unknown authored
      e4cae610
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 72a1ae42
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      72a1ae42
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cf735347
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      cf735347
    • unknown's avatar
      fix so that ndb builds --without-ndb-binlog · ae737a1f
      unknown authored
      ae737a1f
    • unknown's avatar
      10a0b7b9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ed50d896
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      ed50d896
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new · 4234038b
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/2868
      
      
      4234038b
    • unknown's avatar
      WL#2868 Fix backup trigger handling · 4c7d6191
      unknown authored
      BACKUP previous set up triggers using DICT.
      This lead to all kind of trouble.
      An smaller alternative to using SUMA for backup
        is to just make BACKUP handle triggers to TUP directly.
      
      This way all triggers will be totally local,
        and error handling is much simpler.
      
      --- old impl.
      
      Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
      Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
      Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
      Master sends ALTER_TRIG_REQ (online) to local DICT
      Master waits for GCP
      Master starts distributed scan
      When scan has finished
      Master waits for GCP
      Master sends DROP_TRIGGER to local DICT
      Master sends STOP_BACKUP_REQ to all participants
      
      --- new impl.
      
      Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
      Master sends START_BACKUP_REQ to all paricipants
        Participand sends CREATE_TRIG_REQ for all tables to local TUP
      Master waits for GCP
      Master starts distributed scan
      When scan has finished
      Master waits for GCP
      Master sends STOP_BACKUP_REQ to all participants
        Participant sends DROP_TRIGGER to local TUP
      
      Changes:
      All trigger handling is _local_
       This implies, that abort (e.g due to node failure) can be _local_
      
      
      fix testBackup test so that it will run successfully with the (now correct)
      backup trigger code.
      
      
      storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
        rework START_BACKUP signals as we no longer need tableId and triggerIds.
      storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        START_BACKUP_REQ no longer has tableIds and trigger ids
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Use TUP triggers directly.
        
        removes ALTER trigger
        simplifies DROP triggers
        
        changes to node failure handling
        
        changes in signal order
        
        use SlaveData to track slave status.
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        - remove ALTER_TRIG (now unused)
        - add signalNo to BackupRecord
        - add SlaveData
        - remove dead items from MasterData
        - update prototype of startBackupReply
      storage/ndb/src/kernel/blocks/backup/Backup.txt:
        Update signals for new backup code.
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        remove ALTER_TRIG REF and CONF as we no longer use them.
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Add comment about meaning of triggerId
        Add sender BlockNumber parameter to dropTrigger.
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        for SUBSCRIPTION triggers, make it so that the trigger ids are private to each block.
      storage/ndb/test/ndbapi/testBackup.cpp:
        Don't do initial restart, just a restart. This is to avoid cache issues with
        schema versions
      storage/ndb/test/src/NdbBackup.cpp:
        Update error insertions.
      4c7d6191
  2. 19 Jan, 2006 14 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b8c89538
      unknown authored
      into  outpost.site:/home/cps/mysql/devel/test-6
      
      
      b8c89538
    • unknown's avatar
      Fix the tree: plugin-related changes, necessary for · bd7120f9
      unknown authored
      CSV storage engine to be statically compiled.
      Derived from antony's patch.
      
      
      config/ac-macros/storage.m4:
        don't add objects to the object list if
        we don't have them
      configure.in:
        compile CSV statically
      sql/ha_myisam.cc:
        fix prototype to get rid of THD
      sql/ha_myisam.h:
        fix prototype to get rid of THD
      sql/handler.cc:
        new function for plugins
      sql/handler.h:
        fix prototype to get rid of THD
        declare functions used by plugins
      sql/item.h:
        Don't include all the types and files when not building mysqld
      sql/lock.cc:
        don's assume that handler knows about THD
      sql/mysql_priv.h:
        Don't include all the types and files when not building mysqld
        declare new plugin functions
      sql/sql_class.cc:
        New plugin functions
      sql/sql_class.h:
        Don't include all the types and files when not building mysqld
      sql/sql_lex.h:
        Don't include all the types and files when not building mysqld
      storage/csv/Makefile.am:
        compile CSV into a static lib to be
        linked into mysqld
      storage/csv/ha_tina.cc:
        fix ha_tina to be able to build it static
      storage/csv/ha_tina.h:
        fix prototype to get rid of THD
      bd7120f9
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new · 1e84cb0d
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      sql/log_event.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      1e84cb0d
    • unknown's avatar
      mysqlslap.c: · a3242691
      unknown authored
        Fix incorrect option description.
      
      
      client/mysqlslap.c:
        Fix incorrect option description.
      a3242691
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fd40509c
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
      
      
      fd40509c
    • unknown's avatar
      WL #2747: After push fixes · ea67b28c
      unknown authored
      
      mysql-test/ndb/ndbcluster.sh:
        Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
      mysql-test/r/ndb_config.result:
        Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
      mysql-test/r/ndb_restore.result:
        Added check that no extra objects exist before starting
        Added printout from erronous node group map
      mysql-test/t/disabled.def:
        Activated ndb_restore again
      mysql-test/t/ndb_restore.test:
        Added new test cases and handling of error case for node group maps
      storage/ndb/tools/restore/consumer_restore.cpp:
        Removed debug printouts
      storage/ndb/tools/restore/restore_main.cpp:
        Removed debug printouts
        ndbout => info
        some ndbout => err
        and yet others
        ndbout => debug
      ea67b28c
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7dbb63fe
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.12448
      
      
      sql/sql_yacc.yy:
        Auto merged
      7dbb63fe
    • unknown's avatar
      Added two test cases that needs fixing · 098af0ae
      unknown authored
      098af0ae
    • unknown's avatar
      Fixes for broken tree · 0acb58e0
      unknown authored
      
      mysql-test/r/partition_02myisam.result:
        Added to test result
      mysql-test/t/disabled.def:
        New definition of disabled test cases
      0acb58e0
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ae33dd51
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
      
      
      ae33dd51
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 16998a07
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.12448
      
      
      sql/mysqld.cc:
        Auto merged
      16998a07
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6337ad6d
      unknown authored
      into  outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-prepush
      
      
      6337ad6d
    • unknown's avatar
      WL1019: complete patch. Reapplied patch to the clean · 41536fce
      unknown authored
      tree to get rid of multiple typos in CS comments and
      unify the patch.
      
      
      configure.in:
        CSV is compiled in by default now
      include/my_base.h:
        add new ha_extra flag for the log tables
      mysql-test/include/im_check_os.inc:
        we should only run im tests if csv is on for now: im relies
        on mysqld options available only in csv build.
      mysql-test/include/system_db_struct.inc:
        check log tables structure
      mysql-test/lib/init_db.sql:
        create log tables when running tests.
      mysql-test/mysql-test-run.pl:
        Add old logs flag to IM tests. As IM could only deal with
        old logs (this feature is not needed with log tables)
      mysql-test/r/connect.result:
        update result
      mysql-test/r/csv.result:
        update result
      mysql-test/r/im_utils.result:
        update result
      mysql-test/r/information_schema.result:
        update result
      mysql-test/r/mysqlcheck.result:
        update result
      mysql-test/r/show_check.result:
        update result
      mysql-test/r/system_mysql_db.result:
        update result
      mysql-test/t/connect.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/csv.test:
        add tests for concurrent insert (the functionality is added
        to CSV in this patch)
      mysql-test/t/information_schema.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/mysqlcheck.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/show_check.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db_fix.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      scripts/mysql_create_system_tables.sh:
        new system tables: slow_log and general_log
      scripts/mysql_fix_privilege_tables.sql:
        add new log tables: use an SP to create them for
        non-csv build to work fine.
      sql/ha_myisam.cc:
        move locking-related checks to the hanlder
      sql/ha_myisam.h:
        new function declared
      sql/handler.h:
        new virtual function is added: we should check for handler-related
        locking issues in the handler
      sql/lock.cc:
        from now on we check for handler-related locking issues
        in the handler itself rather then in lock.cc
      sql/log.cc:
        Add log tables support, refactoring: there are log event
        handlers with common interface. They are used by the LOGGER
        class, which is responsible for their initialization, cleanup
        and managment. Logging to the tables provided by one of the
        log event handler types.
      sql/log.h:
        declare new log classes
      sql/log_event.cc:
        convert old logging routines calls to use new API
      sql/mysql_priv.h:
        define common log routines and objects
      sql/mysqld.cc:
        Add support for the log tables. Their initalization, cleanup
        and specific options.
      sql/share/errmsg.txt:
        add new error messages for the log tables
      sql/slave.cc:
        convert old logging routines calls to use new API
      sql/sql_base.cc:
        TABLE objects used by the logger should be skipped
        during refreshes (as log tables are always opened
        and locked). fix table_is_used to skip them.  This
        is needed for FLUSH LOGS to work
      sql/sql_db.cc:
        convert old logging routines calls to use new API
      sql/sql_delete.cc:
        fix TRUNCATE to work with log tables
      sql/sql_parse.cc:
        command_name is now an array of LEX_STRINGs
      sql/sql_prepare.cc:
        convert old logging routines calls to use new API
      sql/sql_show.cc:
        convert old logging routines calls to use new API
      sql/sql_table.cc:
        don't reoped the log tables for admin purposes
      sql/table.cc:
        mark log tables as such during the open
      sql/table.h:
        add log-related info
      storage/csv/ha_tina.cc:
        add support for concurrent insert (see bk commit - 5.1 tree
        (petr:1.1910) for standalone patch), add log tables-specific
        csv table handling.
      storage/csv/ha_tina.h:
        enable concurrent insert for CSV, add log table flag
      mysql-test/r/log_tables.result:
        New BitKeeper file ``mysql-test/r/log_tables.result''
      mysql-test/t/log_tables.test:
        New BitKeeper file ``mysql-test/t/log_tables.test''
      41536fce
    • unknown's avatar
      mysqlslap.c: · 40d4fcfc
      unknown authored
        Put options in standard order: --help first, then lexically.
        Rename --number-of-query to --number-of-queries.
      
      
      client/mysqlslap.c:
        Put options in standard order: --help first, then lexically.
        Rename --number-of-query to --number-of-queries.
      40d4fcfc
  3. 18 Jan, 2006 13 commits
    • unknown's avatar
      BUG #16596 · 209ff874
      unknown authored
      Moved init to lex_start
      
      
      sql/sql_lex.cc:
        Added init to lex_start
      sql/sql_yacc.yy:
        Removed init from CREATE INDEX code
      209ff874
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c945f00c
      unknown authored
      into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
      
      
      c945f00c
    • unknown's avatar
      Bug fix · ca1bb5a0
      unknown authored
      
      mysql-test/include/partition_1.inc:
        Drop table missing in test case
      sql/sql_partition.cc:
        Removed some dead code
      sql/sql_yacc.yy:
        initialised name that was missing
      ca1bb5a0
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 471314df
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      471314df
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-new · 4475baa2
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.1.15910
      
      
      4475baa2
    • unknown's avatar
    • unknown's avatar
      bug #15910 (Wrong value on error message) · 183e0dd7
      unknown authored
      
      sql/ha_partition.cc:
        using llstr to covert lonlong to string
      sql/share/errmsg.txt:
        %ld to %s
      183e0dd7
    • unknown's avatar
      ndb - wl#2972 (5.1) omit trigger check post!=pre if recipient is SUMA · 1e0f64fb
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        send identical post/pre data on update if recipient is SUMA (events, replication)
      1e0f64fb
    • unknown's avatar
      Disabled fast/drop index temporarily · 68c1d22b
      unknown authored
      68c1d22b
    • unknown's avatar
      ndb - wl#2972 (5.1, related) un-initialized var in Suma · f21a2c36
      unknown authored
      
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        un-initialized m_reportAll caused event operation create / drop /create to get m_reportAll = true
      f21a2c36
    • unknown's avatar
      disabled.def: · b58c076c
      unknown authored
        Disabled failing tests
      mysql_priv.h:
        Removed compiler warning
      
      
      sql/mysql_priv.h:
        Removed compiler warning
      mysql-test/t/disabled.def:
        Disabled failing tests
      b58c076c
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 74d61bc3
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      74d61bc3
    • unknown's avatar
      loaddata.result, loaddata.test: · 137ae790
      unknown authored
        Adding test case.
      sql_yacc.yy:
        Adding TEXT_STRING_filesystem, which
        converts from character_set_client to
        character_set_conversion.
        Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
        in LOAD DATA and SELECT INTO OUTFILE contexts.
      sql_class.h, sql_class.cc:
        Adding character_set_filesystem variable,
        and charset_is_character_set_filesystem
        flag (to avoid conversion when it's not necessary).
      set_var.h, set_var.cc:
        Adding sys_var_character_set_filesystem
      mysqld.cc:
        Adding --character-set-filesystem startup option.
      
      
      sql/mysqld.cc:
        Adding --character-set-filesystem startup option.
      sql/set_var.cc:
        Adding sys_var_character_set_filesystem
      sql/set_var.h:
        Adding sys_var_character_set_filesystem
      sql/sql_class.cc:
        Adding character_set_filesystem variable,
        and charset_is_character_set_filesystem
        flag (to avoid conversion when it's not necessary).
      sql/sql_class.h:
        Adding character_set_filesystem variable,
        and charset_is_character_set_filesystem
        flag (to avoid conversion when it's not necessary).
      sql/sql_yacc.yy:
        Adding TEXT_STRING_filesystem, which
        converts from character_set_client to
        character_set_conversion.
        Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
        in LOAD DATA and SELECT INTO OUTFILE contexts.
      mysql-test/t/loaddata.test:
        Adding test case.
      mysql-test/r/loaddata.result:
        Adding test case.
      137ae790