1. 29 Jan, 2007 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 72a0d004
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
      
      
      72a0d004
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · b44ae648
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      
      b44ae648
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 · 5776283e
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5776283e
    • unknown's avatar
      Bug#22943 syscall pruning in libmysql · a195ad5e
      unknown authored
       - Set the timeout values only where needed
      
      
      sql/mysql_priv.h:
        Add new functions for setting read and write timeout on "net"
      sql/mysqld.cc:
        - Move the setting of "read_timeout" to the value of "connect_timeout" to
          just before 'check_connection' which is the function where we want
          to use the different timeout
        - With the new functions to set timeout on "net", there is no need to
          specifically set the default wait_timeout on windows.
      sql/net_serv.cc:
        Add new functions for setting read and write timeout of "net, when
        server is compiled not to use alarms it will set the write/read timeout
        directly on connection using 'vio_timeout'(using setsockopt if socket)
      sql/repl_failsafe.cc:
        Put unused code within "#if NOT_USED"
      sql/set_var.cc:
        Use 'net_set_*_timeout' when adjusting timeout value
        on the current connection
      sql/slave.cc:
        The read timeout used when connecting to master server is set
        using 'mysql_options' in 'connect_to_master' function
      sql/sql_parse.cc:
        - Set read and write timeout values to "connect_timeout" during
        connect phase
        - Use "read_timeout" value during sslaccept phase, since this is during
        connect phase it implies "connect-timeout"
        - Set read and write timeout value back to default after connect phase
        - Set "read_timeout" to "wait_timeout" while waiting for client.
      sql/sql_repl.cc:
        Set "read_timeout" to "wait_timeout" while ask other mysqld to send file
      sql-common/client.c:
        Call 'vio_timeout' to set up the read and write timeout's for the
        newly created connection. It only need to be done once at connect time.
      vio/vio.c:
        Use 'vio_timeout' for setting timeout also on an SSL connection
        since they both use sockets
      vio/viossl.c:
        Remove 'vio_ssl_timeout' function
      a195ad5e
  2. 26 Jan, 2007 1 commit
  3. 23 Jan, 2007 1 commit
  4. 22 Jan, 2007 4 commits
  5. 20 Jan, 2007 1 commit
  6. 19 Jan, 2007 5 commits
  7. 18 Jan, 2007 9 commits
  8. 17 Jan, 2007 10 commits
  9. 16 Jan, 2007 2 commits
    • unknown's avatar
      A fix for the broken 4.1-runtime tree. · 9cff68bb
      unknown authored
      
      mysql-test/t/backup.test:
        Backport a patch for sporadically failing myisam.test (and now ps.test)
        from 5.0. The cause was in backup.test not cleaning up tables in
        mysqltest-vardir/tmp after itself.
      mysql-test/t/ps.test:
        Add additional protection against possible failure in the middle of
        backup.test
      9cff68bb
    • unknown's avatar
      Always use two masters for ndb tests · 80818def
      unknown authored
      80818def
  10. 15 Jan, 2007 2 commits
    • unknown's avatar
      A post-merge fix. · 15c83425
      unknown authored
      
      sql/sql_parse.cc:
        A post-merge fix (broken alter_table.test): restore Svoj's fix
        for Bug#23404 lost during merge.
      15c83425
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d470c233
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      d470c233
  11. 12 Jan, 2007 1 commit