1. 01 Sep, 2007 3 commits
  2. 30 Aug, 2007 1 commit
  3. 29 Aug, 2007 26 commits
    • unknown's avatar
      Post-merge fixes, and disable buggy test case on embedded · c8648fa3
      unknown authored
      
      mysql-test/t/query_cache.test:
        Disable query_cache test on embedded, due to bug 30710.
      sql/log_event_old.cc:
        Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.
      c8648fa3
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 · 48193af4
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/51
      
      
      sql/field.cc:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/rpl_record.h:
        Auto merged
      sql/rpl_utility.cc:
        Auto merged
      sql/rpl_utility.h:
        Auto merged
      sql/slave.h:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      sql/log_event.cc:
        Manual merge
      sql/log_event.h:
        Manual merge
      sql/log_event_old.h:
        Manual merge
      sql/rpl_record.cc:
        Manual merge
      sql/slave.cc:
        Manual merge
      48193af4
    • unknown's avatar
      Fix pushbuild test failures which occur on big-endian systems. · 053c9d1c
      unknown authored
        Do not convert innodb autoincrement value to little endian when on
        big endian systems.
      
      
      storage/innobase/row/row0sel.c:
        Do not convert innodb autoincrement value to little endian when on
        big endian systems.
      053c9d1c
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite · 02ac63c1
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      02ac63c1
    • unknown's avatar
      Move instance manager tests to it's own suite · b201a6c7
      unknown authored
      
      mysql-test/suite/im/t/im_daemon_life_cycle-im.opt:
        Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt
      mysql-test/suite/im/t/im_instance_conf-im.opt:
        Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt
      mysql-test/suite/im/t/im_life_cycle-im.opt:
        Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt
      mysql-test/suite/im/t/im_options-im.opt:
        Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt
      mysql-test/suite/im/t/im_utils-im.opt:
        Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt
      mysql-test/suite/im/r/im_cmd_line.result:
        Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result
      mysql-test/suite/im/r/im_daemon_life_cycle.result:
        Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result
      mysql-test/suite/im/r/im_instance_conf.result:
        Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result
      mysql-test/suite/im/r/im_life_cycle.result:
        Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result
      mysql-test/suite/im/r/im_options.result:
        Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result
      mysql-test/suite/im/r/im_utils.result:
        Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result
      mysql-test/suite/im/t/utils.sh:
        Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh
      mysql-test/suite/im/t/wait_for_process.sh:
        Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh
      mysql-test/suite/im/t/wait_for_socket.sh:
        Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh
      mysql-test/suite/im/t/log.sh:
        Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh
      mysql-test/suite/im/t/kill_n_check.sh:
        Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh
      mysql-test/suite/im/t/im_check_env.inc:
        Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc
      mysql-test/suite/im/t/im_cmd_line.imtest:
        Update location of im_check_env.inc
      mysql-test/suite/im/t/im_daemon_life_cycle.imtest:
        Update location of im_check_env.inc
        Add variable UTIL that points to the "ugly" .sh scripts
      mysql-test/suite/im/t/im_instance_conf.imtest:
        Update location of im_check_env.inc
      mysql-test/suite/im/t/im_life_cycle.imtest:
        Update location of im_check_env.inc
        Add variable UTIL that points to the "ugly" .sh scripts
      mysql-test/suite/im/t/im_options.imtest:
        Update location of im_check_env.inc
      mysql-test/suite/im/t/im_utils.imtest:
        Update location of im_check_env.inc
        Add variable UTIL that points to the "ugly" .sh scripts
      mysql-test/t/disabled.def:
        Move disabled im test to suite/im/t/disabled.def
      mysql-test/suite/im/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/im/t/disabled.def''
      b201a6c7
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 59f0a432
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      59f0a432
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · 7cafddc3
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      7cafddc3
    • unknown's avatar
      Remove any old pidfile before starting mysqld to make sure that · 10012b36
      unknown authored
      'mysqld_wait_started' don't return prematurely because of an old
      pidfile
      
      
      10012b36
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bk/b29968-merge-5.1-rpl · 3e82da7a
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/merge-5.1-target-5.1.22
      
      
      3e82da7a
    • unknown's avatar
      BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail): · e5c8240a
      unknown authored
      Removing unguarded read of slave_running field from inside
      terminate_slave_threads(). This could cause premature exit in the event
      that the slave thread already were shutting down, but isn't finished yet.
      
      The fields slave_running, io_thd, and sql_thread are guarded by an
      associated run_lock. A read of these fields were not guarded inside
      terminate_slave_threads(), which caused an assertion to fire. The
      assertion was removed, and the code reorganized slightly.
      
      
      sql/slave.cc:
        Changing signature of terminate_slave_thread() to accept a skip_lock
        parameter instead of two mutexes. This mimics the signature of the
        terminate_slave_threads() function. Code is also changed as a result
        of this.
        
        Removing unguarded check of slave_running field in the master info and
        relay log info structure since that could cause premature exit of
        terminate_slave_threads().
        
        The thread variable for each of the slave threads can change before
        acquiring the run_lock mutex inside terminate_slave_thread(). Hence
        an assertion was removed that read the variable without guarding it
        with run_lock.
        
        Code that checked *slave_running status inside terminate_slave_thread()
        was reorganized slightly.
      sql/slave.h:
        Moving terminate_slave_thread() to use internal linkage.
      e5c8240a
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 4b0d9018
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/t/myisam.test:
        Use local
      4b0d9018
    • unknown's avatar
      Remove unportable use of "system rm" · 2e4963c5
      unknown authored
      2e4963c5
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · f1f39d5d
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      f1f39d5d
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · 5819322b
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      5819322b
    • unknown's avatar
      Fix typo: '$$' => '$' · 305c3526
      unknown authored
      305c3526
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 024bd2f6
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      024bd2f6
    • unknown's avatar
      Remove unportable use of "system rm" · cf37bc45
      unknown authored
      cf37bc45
    • unknown's avatar
      Remove unportable "system rm" · 643b2163
      unknown authored
      643b2163
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 6d0cc3ca
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      6d0cc3ca
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · ec63a858
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      ec63a858
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 3b7f8094
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      3b7f8094
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · ff247563
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      ff247563
    • unknown's avatar
      Remove unportable use of "exec chmod" · 2675c952
      unknown authored
      2675c952
    • unknown's avatar
      Add 'mtr_rmtree' · 038df2d0
      unknown authored
      
      mysql-test/lib/mtr_misc.pl:
        Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
        due to permission problems we will fun File::find to chmod all files and dirs
        to 0777 and then delete.
      mysql-test/mysql-test-run.pl:
        Use 'mtr_rmtree' in favour of 'rmtree'
      038df2d0
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · b288c7d9
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
      
      
      b288c7d9
    • unknown's avatar
      Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue · d27ec7a5
      unknown authored
      - reverting patch as there where unknows sideeffects that we do not have time to follow up on just now
      
      
      d27ec7a5
  4. 28 Aug, 2007 10 commits