1. 23 Jan, 2006 13 commits
  2. 22 Jan, 2006 1 commit
  3. 20 Jan, 2006 20 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · fa90abeb
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      fa90abeb
    • unknown's avatar
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 61946d22
      unknown authored
      into  selena.:H:/MYSQL/src/#00000-mysql-5.1
      
      
      client/mysqlslap.c:
        Auto merged
      configure.in:
        Auto merged
      VC++Files/mysql.sln:
        manual merge
      61946d22
    • unknown's avatar
      Post review updates for win32 port of mysqlslap · 94ea9883
      unknown authored
      94ea9883
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-new · b045ee32
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      b045ee32
    • 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
      Fix formatting. · 9687e568
      unknown authored
      9687e568
    • 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
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1.4 · 2c6b3c8c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        merge
      storage/ndb/src/ndbapi/ndberror.c:
        merge
      2c6b3c8c
    • 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
  4. 19 Jan, 2006 6 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