mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
70aa7424c4
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree. BUILD/SETUP.sh: Added -DPEDANTIC_SAFEMALLOC as standard debug option Docs/manual.texi: Changes for new version. client/mysql.cc: Fixed default value for rehash cleanup client/mysqladmin.c: Cleanup client/mysqlbinlog.cc: cleanup client/mysqldump.c: Cleanup client/mysqlmanager-pwgen.c: Cleanup client/mysqlmanagerc.c: Cleanup client/mysqltest.c: Cleanup dbug/dbug.c: Cleanup extra/resolve_stack_dump.c: Cleanup & Simple optimizations include/ft_global.h: Cleanup include/my_alloc.h: Cleanup include/my_global.h: Cleanup include/my_sys.h: Cleanup include/myisam.h: Cleanup libmysql/libmysql.c: Cleanup libmysql/manager.c: Cleanup myisam/ft_boolean_search.c: Cleanup myisam/ft_dump.c: Change strcpy -> strmov myisam/ft_eval.c: Cleanup myisam/ft_nlq_search.c: Cleanup myisam/ft_test1.c: strncpy -> strnmov myisam/ft_update.c: Cleanup myisam/mi_static.c: Cleanup myisam/mi_test2.c: Cleanup myisam/mi_write.c: Cleanup mysys/mf_fn_ext.c: Cleanup mysys/mf_iocache.c: Cleanup mysys/mf_iocache2.c: Cleanup mysys/my_getopt.c: Cleanup mysys/my_read.c: Cleanup mysys/my_thr_init.c: Cleanup mysys/queues.c: Cleanup mysys/safemalloc.c: Cleanup sql/field.cc: Indentation cleanups sql/ha_berkeley.cc: Indentation cleanups sql/ha_myisam.cc: Cleanup sql/item.h: Indentation cleanups sql/item_cmpfunc.cc: Indentation cleanups sql/item_create.cc: cleanup sql/item_func.cc: Cleanup sql/item_func.h: Indentation cleanups sql/item_strfunc.cc: Indentation cleanups sql/item_sum.cc: Indentation cleanups sql/item_timefunc.cc: Indentation cleanups sql/lock.cc: Indentation cleanups sql/log.cc: Cleanup strnmov -> strmake sql/log_event.cc: Cleanup + optimizations Fixed memory leak Added missing pthread_mutex_unlock() (On error condition) sql/log_event.h: Indentation and comment cleanup Merged #ifdef's into common blocks for better readability sql/mini_client.cc: Indentation cleanup sql/mysql_priv.h: Cleanup Changed int function to bool sql/mysqld.cc: Indentation and comment cleanup sql/net_pkg.cc: Indentation cleanup sql/net_serv.cc: Changed int function -> bool sql/nt_servc.cc: Cleanup sql/opt_range.cc: Indentation cleanup sql/repl_failsafe.cc: Cleanup + simple optimization strnmov -> strmake sql/slave.cc: strnmov -> strmake Cleanups sql/slave.h: Cleanup sql/sql_acl.cc: Indentation and DBUG_PRINT cleanup Changed WITH MAX... to not use = sql/sql_base.cc: Indentation cleanup sql/sql_cache.cc: Indentation cleanup sql/sql_class.cc: Indentation cleanup sql/sql_class.h: Renamed some struct slots sql/sql_delete.cc: Indentation cleanup sql/sql_handler.cc: Indentation cleanup sql/sql_insert.cc: Use new slot names. sql/sql_lex.cc: Indentation cleanup sql/sql_lex.h: Indentation cleanup sql/sql_load.cc: Indentation cleanup sql/sql_parse.cc: Indentation cleanup Removed not used check from LOCK TABLES sql/sql_repl.cc: strnmov -> strmake sql/sql_repl.h: Removed test if file is included (We want to know if it's included twice to avoid this) sql/sql_select.cc: Indentation cleanup sql/sql_show.cc: Indentation cleanup sql/sql_string.cc: Indentation cleanup sql/sql_table.cc: Indentation cleanup sql/sql_union.cc: Use renamed struct slot sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Removed = after GRANT ... MAX_ to make the syntax uniform sql/table.cc: Indentation cleanup sql/table.h: Indentation cleanup sql/time.cc: Indentation cleanup sql/udf_example.cc: Indentation cleanup sql/unireg.cc: strnmov -> strmake tests/grant.pl: Added test for LOCK TABLES tools/mysqlmanager.c: Cleanup fopen() -> my_fopen() vio/viosocket.c: DBUG_PRINT cleanups vio/viosslfactories.c: Indentation cleanup Checking of results from malloc() Fixed possible memory leak BitKeeper/etc/ignore: Added scripts/mysql_secure_installation to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
263 lines
6.4 KiB
C
263 lines
6.4 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include <my_global.h>
|
|
#if defined(THREAD)
|
|
#include <my_pthread.h> /* because of signal() */
|
|
#endif
|
|
#include "mysql.h"
|
|
#include "mysql_version.h"
|
|
#include "mysqld_error.h"
|
|
#include <my_sys.h>
|
|
#include <mysys_err.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include <my_net.h>
|
|
#include <errmsg.h>
|
|
#include <violite.h>
|
|
#include <sys/stat.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
#if defined(OS2)
|
|
# include <sys/un.h>
|
|
#elif !defined( __WIN__)
|
|
#include <sys/resource.h>
|
|
#ifdef HAVE_SYS_UN_H
|
|
# include <sys/un.h>
|
|
#endif
|
|
#include <netdb.h>
|
|
#ifdef HAVE_SELECT_H
|
|
# include <select.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#endif
|
|
#include <sys/utsname.h>
|
|
#endif /* __WIN__ */
|
|
|
|
#ifndef INADDR_NONE
|
|
#define INADDR_NONE -1
|
|
#endif
|
|
|
|
#define RES_BUF_SHIFT 5
|
|
#define NET_BUF_SIZE 2048
|
|
|
|
MYSQL_MANAGER* STDCALL mysql_manager_init(MYSQL_MANAGER* con)
|
|
{
|
|
int net_buf_size=NET_BUF_SIZE;
|
|
if (!con)
|
|
{
|
|
if (!(con=(MYSQL_MANAGER*)my_malloc(sizeof(*con)+net_buf_size,
|
|
MYF(MY_WME|MY_ZEROFILL))))
|
|
return 0;
|
|
con->free_me=1;
|
|
con->net_buf=(char*)con+sizeof(*con);
|
|
}
|
|
else
|
|
{
|
|
bzero((char*)con,sizeof(*con));
|
|
if (!(con->net_buf=my_malloc(net_buf_size,MYF(0))))
|
|
return 0;
|
|
}
|
|
con->net_buf_pos=con->net_data_end=con->net_buf;
|
|
con->net_buf_size=net_buf_size;
|
|
return con;
|
|
}
|
|
|
|
MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con,
|
|
const char* host,
|
|
const char* user,
|
|
const char* passwd,
|
|
unsigned int port)
|
|
{
|
|
my_socket sock;
|
|
struct sockaddr_in sock_addr;
|
|
uint32 ip_addr;
|
|
char msg_buf[MAX_MYSQL_MANAGER_MSG];
|
|
int msg_len;
|
|
Vio* vio;
|
|
|
|
if (!host)
|
|
host="localhost";
|
|
if (!user)
|
|
user="root";
|
|
if (!passwd)
|
|
passwd="";
|
|
|
|
if ((sock=(my_socket)socket(AF_INET,SOCK_STREAM,0)) == INVALID_SOCKET)
|
|
{
|
|
con->last_errno=errno;
|
|
strmov(con->last_error,"Cannot create socket");
|
|
goto err;
|
|
}
|
|
if (!(vio=vio_new(sock,VIO_TYPE_TCPIP,FALSE)))
|
|
{
|
|
con->last_errno=ENOMEM;
|
|
strmov(con->last_error,"Cannot create network I/O object");
|
|
goto err;
|
|
}
|
|
vio_blocking(vio,TRUE);
|
|
my_net_init(&con->net,vio);
|
|
bzero((char*) &sock_addr,sizeof(sock_addr));
|
|
sock_addr.sin_family = AF_INET;
|
|
if ((int) (ip_addr = inet_addr(host)) != (int) INADDR_NONE)
|
|
{
|
|
memcpy_fixed(&sock_addr.sin_addr,&ip_addr,sizeof(ip_addr));
|
|
}
|
|
else
|
|
{
|
|
int tmp_errno;
|
|
struct hostent tmp_hostent,*hp;
|
|
char buff2[GETHOSTBYNAME_BUFF_SIZE];
|
|
hp = my_gethostbyname_r(host,&tmp_hostent,buff2,sizeof(buff2),
|
|
&tmp_errno);
|
|
if (!hp)
|
|
{
|
|
con->last_errno=tmp_errno;
|
|
sprintf(con->last_error,"Could not resolve host '%s'",host);
|
|
my_gethostbyname_r_free();
|
|
goto err;
|
|
}
|
|
memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length);
|
|
my_gethostbyname_r_free();
|
|
}
|
|
sock_addr.sin_port = (ushort) htons((ushort) port);
|
|
if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
|
|
0) <0)
|
|
{
|
|
con->last_errno=errno;
|
|
sprintf(con->last_error ,"Could not connect to %-.64s", host);
|
|
goto err;
|
|
}
|
|
/* read the greating */
|
|
if (my_net_read(&con->net) == packet_error)
|
|
{
|
|
con->last_errno=errno;
|
|
strmov(con->last_error,"Read error on socket");
|
|
goto err;
|
|
}
|
|
sprintf(msg_buf,"%-.16s %-.16s\n",user,passwd);
|
|
msg_len=strlen(msg_buf);
|
|
if (my_net_write(&con->net,msg_buf,msg_len) || net_flush(&con->net))
|
|
{
|
|
con->last_errno=con->net.last_errno;
|
|
strmov(con->last_error,"Write error on socket");
|
|
goto err;
|
|
}
|
|
if (my_net_read(&con->net) == packet_error)
|
|
{
|
|
con->last_errno=errno;
|
|
strmov(con->last_error,"Read error on socket");
|
|
goto err;
|
|
}
|
|
if ((con->cmd_status=atoi((char*) con->net.read_pos)) != MANAGER_OK)
|
|
{
|
|
strmov(con->last_error,"Access denied");
|
|
goto err;
|
|
}
|
|
if (!my_multi_malloc(MYF(0), &con->host, (uint)strlen(host)+1,
|
|
&con->user, (uint)strlen(user)+1,
|
|
&con->passwd, (uint)strlen(passwd)+1,
|
|
NullS))
|
|
{
|
|
con->last_errno=ENOMEM;
|
|
strmov(con->last_error,"Out of memory");
|
|
goto err;
|
|
}
|
|
strmov(con->host,host);
|
|
strmov(con->user,user);
|
|
strmov(con->passwd,passwd);
|
|
return con;
|
|
|
|
err:
|
|
{
|
|
my_bool free_me=con->free_me;
|
|
con->free_me=0;
|
|
mysql_manager_close(con);
|
|
con->free_me=free_me;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void STDCALL mysql_manager_close(MYSQL_MANAGER* con)
|
|
{
|
|
/*
|
|
No need to free con->user and con->passwd, because they were
|
|
allocated in my_multimalloc() along with con->host, freeing
|
|
con->hosts frees the whole block
|
|
*/
|
|
my_free((gptr)con->host,MYF(MY_ALLOW_ZERO_PTR));
|
|
net_end(&con->net);
|
|
if (con->free_me)
|
|
my_free((gptr)con,MYF(0));
|
|
}
|
|
|
|
|
|
int STDCALL mysql_manager_command(MYSQL_MANAGER* con,const char* cmd,
|
|
int cmd_len)
|
|
{
|
|
if (!cmd_len)
|
|
cmd_len=strlen(cmd);
|
|
if (my_net_write(&con->net,(char*)cmd,cmd_len) || net_flush(&con->net))
|
|
{
|
|
con->last_errno=errno;
|
|
strmov(con->last_error,"Write error on socket");
|
|
return 1;
|
|
}
|
|
con->eof=0;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, char* res_buf,
|
|
int res_buf_size)
|
|
{
|
|
char* res_buf_end=res_buf+res_buf_size;
|
|
char* net_buf=(char*) con->net.read_pos, *net_buf_end;
|
|
int res_buf_shift=RES_BUF_SHIFT;
|
|
uint num_bytes;
|
|
|
|
if (res_buf_size<RES_BUF_SHIFT)
|
|
{
|
|
con->last_errno=ENOMEM;
|
|
strmov(con->last_error,"Result buffer too small");
|
|
return 1;
|
|
}
|
|
|
|
if ((num_bytes=my_net_read(&con->net)) == packet_error)
|
|
{
|
|
con->last_errno=errno;
|
|
strmov(con->last_error,"socket read failed");
|
|
return 1;
|
|
}
|
|
|
|
net_buf_end=net_buf+num_bytes;
|
|
|
|
if ((con->eof=(net_buf[3]==' ')))
|
|
res_buf_shift--;
|
|
net_buf+=res_buf_shift;
|
|
res_buf_end[-1]=0;
|
|
for (;net_buf<net_buf_end && res_buf < res_buf_end;res_buf++,net_buf++)
|
|
{
|
|
if ((*res_buf=*net_buf) == '\r')
|
|
{
|
|
*res_buf=0;
|
|
break;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|