1. 15 Sep, 2007 3 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 82b10338
      unknown authored
      into  mysql.com:/home/tnurnberg/15327/51-15327
      
      
      configure.in:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysql_upgrade.c:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run-shell.sh:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      82b10338
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · 3bc5123e
      unknown authored
      after merge fix :-/
      
      
      3bc5123e
    • unknown's avatar
      Merge mysql.com:/home/tnurnberg/15327/50-15327 · 682c2284
      unknown authored
      into  mysql.com:/home/tnurnberg/15327/51-15327
      
      
      BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
        Auto merged
      BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
        Auto merged
      client/mysql_upgrade.c:
        Auto merged
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run-shell.sh:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      scripts/mysql_fix_privilege_tables.sh:
        Auto merged
      server-tools/instance-manager/priv.h:
        Auto merged
      client/mysql.cc:
        manual merge
      client/mysqladmin.cc:
        manual merge
      client/mysqlbinlog.cc:
        manual merge
      client/mysqlcheck.c:
        manual merge
      client/mysqldump.c:
        manual merge
      client/mysqlimport.c:
        manual merge
      client/mysqlshow.c:
        manual merge
      client/mysqltest.c:
        manual merge
      sql/mysqld.cc:
        manual merge
      tests/mysql_client_test.c:
        manual merge
      tests/thread_test.c:
        manual merge
      682c2284
  2. 13 Sep, 2007 1 commit
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · ee7f125d
      unknown authored
      make sure that if builder configured with a non-standard (!= 3306)
      default TCP port that value actually gets used throughout. if they
      didn't configure a value, assume "use a sensible default", which
      will be read from /etc/services or, failing that, from the factory
      default. That makes the order of preference
      - command-line option
      - my.cnf, where applicable
      - $MYSQL_TCP_PORT environment variable
      - /etc/services (unless configured --with-tcp-port)
      - default port (--with-tcp-port=... or factory default)
      
      
      client/mysql.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysql_upgrade.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqladmin.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlbinlog.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlcheck.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqldump.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlimport.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlmanagerc.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      configure.in:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        If MYSQL_TCP_PORT defaulted in configure (factory default 3306
        at the time of this writing), set MYSQL_TCP_PORT to factory
        default, then clear factory default after. That way, we lose no
        information, and we can distinguish between "defaulted" and the
        pathological case "builder specifically configured a port that
        coincides with factory default." This can in theory happen if
        builder configures and builds several servers from a script
        (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
        Not all that probable, but much preferable to having more "magic"
        happen in the server when we can solve this without any guesswork.
      client/mysqlshow.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqltest.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      include/mysql_version.h.in:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      libmysql/libmysql.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        initialize default tcp port for client, like so:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
        - environment variable MYSQL_TCP_PORT overrides this default
        - command-line option overrides all of the above
      mysql-test/Makefile.am:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      mysql-test/mysql-test-run-shell.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        set up MYSQL_TCP_PORT if not already set in environment:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
      netware/mysql_test_run.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      netware/mysqld_safe.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      scripts/Makefile.am:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      scripts/mysql_config.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        set up MYSQL_TCP_PORT if not already set in environment:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
      scripts/mysql_fix_privilege_tables.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        clarifying notice only
      scripts/mysqld_safe-watch.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      server-tools/instance-manager/priv.h:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      sql/mysqld.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        if builder specifically requested a default port, use that
        (even if it coincides with our factory default).
        only if they didn't do we check /etc/services (and, failing
        on that, fall back to the factory default of 3306).
        either default can be overridden by the environment variable
        MYSQL_TCP_PORT, which in turn can be overridden with command
        line options.
      tests/mysql_client_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      tests/ssl_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      tests/thread_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      ee7f125d
  3. 11 Sep, 2007 1 commit
    • unknown's avatar
      Add support for specifying suites not located in mysql-test/suite/ · ecee2de1
      unknown authored
      Example otions that will all run binlog_stm_binlog.test in suite/binlog:
       --suite=binlog binlog.binlog_stm_binlog
       --suite=binlog binlog_stm_binlog
       binlog_stm_binlog
       --suite=suite/binlog binlog.binlog_stm_binlog
       --suite=suite/binlog binlog_stm_binlog
       
      
      
      ecee2de1
  4. 01 Sep, 2007 4 commits
  5. 31 Aug, 2007 4 commits
  6. 30 Aug, 2007 4 commits
  7. 29 Aug, 2007 23 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
      Added ORDER BY to udf select so that results are ordered. · 674f49f8
      unknown authored
      
      mysql-test/include/rpl_udf.inc:
        ORDER BY to force order
      mysql-test/suite/rpl/r/rpl_udf.result:
        Fix for ORDER BY
      674f49f8
    • 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