mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
09a53f28a7
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
269 lines
6.7 KiB
C
269 lines
6.7 KiB
C
/* Copyright (C) 2000-2004 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.
|
|
|
|
There are special exceptions to the terms and conditions of the GPL as it
|
|
is applied to this software. View the full text of the exception in file
|
|
EXCEPTIONS-CLIENT in the directory of this software distribution.
|
|
|
|
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(__NETWARE__)
|
|
#include <netdb.h>
|
|
#include <sys/select.h>
|
|
#include <sys/utsname.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;
|
|
in_addr_t ip_addr;
|
|
char msg_buf[MAX_MYSQL_MANAGER_MSG];
|
|
int msg_len;
|
|
Vio* vio;
|
|
my_bool not_used;
|
|
|
|
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, ¬_used);
|
|
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 '%-.64s'",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))
|
|
{
|
|
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,(uchar*) 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((uchar*)con->host,MYF(MY_ALLOW_ZERO_PTR));
|
|
net_end(&con->net);
|
|
if (con->free_me)
|
|
my_free((uchar*)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,(const uchar*)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;
|
|
ulong 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;
|
|
}
|