database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

fixes for MYSQL manager

Browse Source 
mysys/md5.c:
  Rename: sql/md5.c -> mysys/md5.c
include/md5.h:
  Rename: mysys/md5.h -> include/md5.h
client/Makefile.am:
  added mysqlmanagerc
include/Makefile.am:
  moved md5.h to include
include/mysql.h:
  added mysqlmanager client code
include/mysql_com.h:
  renamed connect2 to my_connect() and made it extern
libmysql/Makefile.shared:
  added md5 to libmysqlclient
libmysql/libmysql.c:
  connect2->my_connect
mysys/Makefile.am:
  added md5 to client
sql/Makefile.am:
  md5 -> mysys
sql/handler.cc:
  fixed typo
tools/managertest1.nc:
  cleanup
tools/mysqlmanager.c:
  fixed bugs
  added md5 authentication
BitKeeper/etc/ignore:
  Added client/mysqlmanagerc to the ignore list
vio/test-ssl:
  no change
This commit is contained in:
unknown
2001-09-19 14:30:43 -06:00
parent 623a6e551a
commit ba2c3fcd6a
17 changed files with 325 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysql/libmysql.c
View File

@@ -138,12 +138,12 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
* A modified version of connect(). connect2() allows you to specify
* a timeout value, in seconds, that we should wait until we
* derermine we can't connect to a particular host. If timeout is 0,
* connect2() will behave exactly like connect().
* my_connect() will behave exactly like connect().
*
* Base version coded by Steve Bernacki, Jr. <steve@navinet.net>
*****************************************************************************/
static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
uint timeout)
{
#if defined(__WIN__) || defined(OS2)
@@ -1521,7 +1521,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
bzero((char*) &UNIXaddr,sizeof(UNIXaddr));
UNIXaddr.sun_family = AF_UNIX;
strmov(UNIXaddr.sun_path, unix_socket);
if (connect2(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr),
if (my_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr),
mysql->options.connect_timeout) <0)
{
DBUG_PRINT("error",("Got error %d on connect to local server",socket_errno));
@@ -1621,7 +1621,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
}
#endif
sock_addr.sin_port = (ushort) htons((ushort) port);
if (connect2(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
mysql->options.connect_timeout) <0)
{
DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno,host));