• unknown's avatar
    Bug#26664 test suite times out on OS X 64bit · 945f3c2c
    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 'my_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. 
     - Move declaration of 'vio_timeout' into "vio_priv.h"
    
    
    include/mysql_com.h:
      Move the net_set_*_timeout function declarations to mysql_com.h and
      rename to my_net_set_*_timeout to avoid name clashes
    include/violite.h:
      Move declaration of 'vio_timeout' to vio_priv.h (to make
      the function as private as possible)
    libmysql/libmysql.c:
      Use my_net_read_timeout or my_net_write_timeout when setting
      the timeouts. Move the global variables for my_net_read/my_write_timeout
      into the only place where they are used. Thus removing them...
    server-tools/instance-manager/mysql_connection.cc:
      Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
    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
    sql/net_serv.cc:
      No need to cast the net->write_timeout value from "uint" to "uint"
    sql/set_var.cc:
      Rename net_set_*_timeout to my_net_set_*_timeout
    sql/sql_client.cc:
      Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
    sql/sql_parse.cc:
      Rename net_set_*_timeout to my_net_set_*_timeout
    sql/sql_repl.cc:
      Rename net_set_*_timeout to my_net_set_*_timeout
    vio/vio_priv.h:
      Move declaration of 'vio_timeout' to vio_priv.h
    vio/viosocket.c:
      Cleanup 'vio_timeout'
       - Use "const void*" on POSIX and "const char*" on windows for
         setsockopt
       - Add DBUG_PRINT's
       - Add comment about why we don't have an implementation of
        vio_timeout for platforms not supporting SO_SNDTIMEO or SO_RCVTIMEO
    945f3c2c
mysql_priv.h 67.1 KB