• unknown's avatar
    BUG#29083 - test suite times out on OS X 64bit - also in older releases · 5eafd5b1
    unknown authored
    The "mysql client in mysqld"(which is used by
    replication and federated) should use alarms instead of setting
    socket timeout value if the rest of the server uses alarm. By
    always calling 'my_net_set_write_timeout'
    or 'net_set_read_timeout' when changing the timeout value(s), the
    selection whether to use alarms or timeouts will be handled by
    ifdef's in those two functions.
    
    This is minimal backport of patch for BUG#26664, which was pushed
    to 5.0 and up.
    
    Affects 4.1 only.
    
    
    include/mysql_com.h:
      Move the net_set_*_timeout function declarations to mysql_com.h
    sql-common/client.c:
       Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
    sql/mysql_priv.h:
      Move the net_set_*_timeout function declarations to mysql_com.h
    5eafd5b1
mysql_priv.h 50.6 KB