mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f01f49916b
Fixed bugs in my last changeset that made MySQL hard to compile. Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables. Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions Extended my_chsize() to allow one to specify a filler character. Extend vio_blocking to return the old state (This made some usage of this function much simpler) Added testing for some functions that they caller have got the required mutexes before calling the function. Use setrlimit() to ensure that we can write core file if one specifies --core-file. Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len Added variables foreign_key_checks & unique_checks. Less logging from replication code (if not started with --log-warnings) Changed that SHOW INNODB STATUS requre the SUPER privilege More DBUG statements and a lot of new code comments BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a: Delete: mysql-test/r/rpl_compat.result BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f: Delete: mysql-test/t/rpl_compat.test Docs/manual.texi: Updated manual with fixes in this changeset client/mysqltest.c: Indentation cleanup Better error messages for some error conditions. include/my_pthread.h: Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex. include/my_sys.h: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) include/raid.h: New my_chsize() include/violite.h: Extend vio_blocking to return the old state innobase/include/dyn0dyn.h: Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE) innobase/include/dyn0dyn.ic: Merge with 3.23 isam/create.c: Fix for new my_chsize() isam/isamchk.c: Fix for new my_chsize() isam/pack_isam.c: Fix for new my_chsize() libmysql/manager.c: Fix for new vio_blocking() libmysqld/lib_sql.cc: Fix for new open_log() myisam/mi_cache.c: Fix typo from previous checking myisam/mi_check.c: Fix for new my_chsize() myisam/mi_create.c: Fix for new my_chsize() myisam/mi_delete_all.c: Fix for new my_chsize() myisam/myisampack.c: Fix for new my_chsize() mysql-test/include/master-slave.inc: Better initialization for replication tests mysql-test/mysql-test-run.sh: Added option --log-warnings mysql-test/r/insert.result: More tests if INSERT ...(DEFAULT) mysql-test/r/rpl000001.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000002.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000003.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000004.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000005.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000006.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000007.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000008.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000009.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000010.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000011.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000012.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000013.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000014.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_alter.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_empty_master_crash.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_get_lock.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_log.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_magic.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_mystery22.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_skip_error.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_sporadic_master.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/insert.test: More tests if INSERT ...(DEFAULT) mysql-test/t/rpl000001.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000002.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000003.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000004.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000005.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000006.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000007.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000009.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000011.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000013.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000014.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_alter.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_empty_master_crash.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_get_lock.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_magic.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_mystery22.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_skip_error.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_sporadic_master.test: Clean up tests for new master-slave.inc Remove 'use database' mysys/mf_iocache.c: More debug info Force seek after reinit_io_cache() mysys/mf_iocache2.c: Added my_b_filelength() mysys/my_chsize.c: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) mysys/raid.cc: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) sql/field.h: Fix for INSERT ... (DEFAULT) sql/ha_berkeley.h: Fix for dynamic variables sql/ha_innodb.cc: Change sprintf() to my_sprintf() to make code portable. Fix after sync with 3.23 (We still need to fix the storage of the replication position in innodb) sql/ha_innodb.h: Fix for dynamic variables sql/handler.cc: Remove writting of COMMIT to the binary log. (Now done in MYSQL_LOG::write()) sql/item_func.cc: Query_log_event() now always takes query length. sql/item_func.h: Indentation cleanup sql/item_strfunc.h: Indentation cleanup sql/item_timefunc.h: Indentation cleanup sql/lock.cc: Check that we own critical mutexes. sql/log.cc: Big code cleanup / rewrite / optimize. - The index log file has its own IO_CACHE object. - Many functions totally rewritten to make them smaller and faster. - New handling of index log files - Lots of new comments sql/log_event.cc: Code cleanup New comments sql/log_event.h: Query_log_event() now always takes query length. sql/mini_client.cc: Better error messages on reconnect. Fixed wrong variable usage from last commit. sql/mysql_priv.h: New arguments to open_log() sql/mysqld.cc: Use setrlimit() to ensure that we can write core file if one specifies --core-file Added index file name as parameter to openlog(). Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len sql/net_serv.cc: Use new vio_blocking() (The vio_blocking() change was done to make this code more readable) sql/repl_failsafe.cc: Minor code cleanup sql/set_var.cc: Added variables slave_compressed_protocol, foreign_key_checks & unique_checks. sql/set_var.h: Generalization sql/slave.cc: Code cleanup & rewrite. Dont call SELECT VERSION() on check_master_version() New init_slave() code. Ensure that all threads create a THD early. Add locks around manipulation of critical structures Don't retry a command more than master_retry_count times. Write less warnings to the log file (if not started with --log-warnings) Faster flush_relay_log_info() sql/slave.h: More comments Added new arguments to some functions. sql/sql_acl.cc: More DBUG info New parameter to Query_log_event() sql/sql_base.cc: Added some mutex checking. sql/sql_cache.cc: Less not critical debug info sql/sql_class.h: Fix for new log handling. sql/sql_db.cc: Added mutex around remove_db_from_cache() sql/sql_delete.cc: Added missing parameters to changed functions sql/sql_insert.cc: Added missing parameters to changed functions sql/sql_parse.cc: Do an 'end_active_trans()' before 'load_master_data' Changed that SHOW INNODB STATUS requre the SUPER privilege Added new function parameters to new functions sql/sql_rename.cc: Added missing parameters to changed functions sql/sql_repl.cc: Code cleanups / new comments Fix for new find_first_log() calling standard. More DBUG statements. Show binlogs updated to use new IO_CACHE:d index log file. sql/sql_repl.h: New function arguments sql/sql_select.cc: Indentation changes sql/sql_table.cc: Added missing parameters to changed functions Added checking of mutex Added mutex around critical regions. sql/sql_test.cc: Don't use THR_ALARM if the configuration doesn't support it. sql/sql_update.cc: Added missing parameters to changed functions sql/table.cc: Added missing parameters to changed functions vio/vio.c: Extend vio_blocking to return the old state vio/viosocket.c: Extend vio_blocking to return the old state vio/viossl.c: Extend vio_blocking to return the old state
264 lines
6.5 KiB
C
264 lines
6.5 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;
|
|
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 '%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;
|
|
}
|