mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
87f9ad3724
More DBUG info for replication Better error messages from replication Fixed bug in replication code when connecting to 'localhost' (time was not released properly) Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug) Removed warning when setting an AUTO_INCREMENT field to NULL Build-tools/Do-compile: Always run test with --warnings during build Docs/manual.texi: Changelog configure.in: Use our version of RWLOCKS on UNIXWARE 7 include/my_pthread.h: Use our version of RWLOCKS on UNIXWARE 7 include/mysql_version.h.in: Fixed warning when compiling embedded server include/mysqld_error.h: New error messages libmysql/libmysql.c: Give connect error message on reconnect if it fails. Fixed possible buffer overflow in expand_error() Added error messages for some error conditions. mysql-test/mysql-test-run.sh: Portability fixes: - Search after 'time' in path. - Search after mysqld in libexec - Remove end / when doing rm -r (fix for BSD) Clean up skip_test handling. mysql-test/r/rpl_empty_master_crash.result: New results mysql-test/t/rpl_empty_master_crash.test: Extended test mysys/mf_iocache.c: Remember file position on failed read. mysys/mf_iocache2.c: Fixed bug in filelength() call. mysys/thr_alarm.c: Made alarm handling more threadsafe when use with DBUG. mysys/thr_mutex.c: More debug info sql/log_event.cc: More DBUG_PRINT statements. sql/mini_client.cc: Better error reporting on failures. Return connect error on reconnect failure (instead of SERVER_GONE_ERROR) Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely) sql/mysql_priv.h: Fixed arguments to mysql_binlog_send() sql/mysqld.cc: Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug) sql/net_pkg.cc: Removed dead code sql/net_serv.cc: Ensure that last_errno is set in net_real_write() sql/repl_failsafe.cc: Code cleanup. Better error handling. sql/share/czech/errmsg.txt: New error messages. sql/share/danish/errmsg.txt: New error messages. sql/share/dutch/errmsg.txt: New error messages. sql/share/english/errmsg.txt: New error messages. sql/share/estonian/errmsg.txt: New error messages. sql/share/french/errmsg.txt: New error messages. sql/share/german/errmsg.txt: New error messages. sql/share/greek/errmsg.txt: New error messages. sql/share/hungarian/errmsg.txt: New error messages. sql/share/italian/errmsg.txt: New error messages. sql/share/japanese/errmsg.txt: New error messages. sql/share/korean/errmsg.txt: New error messages. sql/share/norwegian-ny/errmsg.txt: New error messages. sql/share/norwegian/errmsg.txt: New error messages. sql/share/polish/errmsg.txt: New error messages. sql/share/portuguese/errmsg.txt: New error messages. mysql-test/r/rpl_log_pos.result: Updated results mysql-test/t/rpl_log_pos.test: Added 'sleep' commands to make tests repeatable. sql/share/romanian/errmsg.txt: New error messages. sql/share/russian/errmsg.txt: New error messages. sql/share/slovak/errmsg.txt: New error messages. sql/share/spanish/errmsg.txt: New error messages. sql/share/swedish/errmsg.txt: New error messages. sql/share/ukrainian/errmsg.txt: New error messages. sql/slave.cc: Code optimization and cleanup. More DBUG statements. Better cleanup if start slave fails. Better error messages from 'fetch_master_table' Thread safer handling of 'wait_for_pos' sql/slave.h: Better handling of wait_for_pos sql/sql_load.cc: Removed warning when setting an AUTO_INCREMENT field to NULL sql/sql_parse.cc: Fixed calling of function that has changed. sql/sql_repl.cc: More DBUG statements Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.
231 lines
6.7 KiB
C
231 lines
6.7 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 */
|
|
|
|
/* This makes a wrapper for mutex handling to make it easier to debug mutex */
|
|
|
|
#include <my_global.h>
|
|
#if defined(HAVE_LINUXTHREADS) && !defined (__USE_UNIX98)
|
|
#define __USE_UNIX98 /* To get rw locks under Linux */
|
|
#endif
|
|
#include <m_string.h>
|
|
#if defined(THREAD) && defined(SAFE_MUTEX)
|
|
#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
|
|
#include <my_pthread.h>
|
|
|
|
#ifndef DO_NOT_REMOVE_THREAD_WRAPPERS
|
|
/* Remove wrappers */
|
|
#undef pthread_mutex_init
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_unlock
|
|
#undef pthread_mutex_destroy
|
|
#undef pthread_cond_wait
|
|
#undef pthread_cond_timedwait
|
|
#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
|
|
#define pthread_mutex_init(a,b) my_pthread_mutex_init((a),(b))
|
|
#endif
|
|
#endif /* DO_NOT_REMOVE_THREAD_WRAPPERS */
|
|
|
|
int safe_mutex_init(safe_mutex_t *mp,
|
|
const pthread_mutexattr_t *attr __attribute__((unused)))
|
|
{
|
|
bzero((char*) mp,sizeof(*mp));
|
|
pthread_mutex_init(&mp->global,MY_MUTEX_INIT_ERRCHK);
|
|
pthread_mutex_init(&mp->mutex,attr);
|
|
return 0;
|
|
}
|
|
|
|
int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count > 0 && pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to lock mutex at %s, line %d, when the mutex was already locked at %s, line %d in thread %s\n",
|
|
file,line,mp->file, mp->line, my_thread_name());
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_mutex_lock(&mp->mutex);
|
|
if (error || (error=pthread_mutex_lock(&mp->global)))
|
|
{
|
|
fprintf(stderr,"Got error %d when trying to lock mutex at %s, line %d\n",
|
|
error, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Error in thread libray: Got mutex at %s, \
|
|
line %d more than 1 time\n", file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= (char*) file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count == 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to unlock mutex that wasn't locked at %s, line %d\n Last used at %s, line: %d\n",
|
|
file,line,mp->file ? mp->file : "",mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (!pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to unlock mutex at %s, line %d that was locked by another thread at: %s, line: %d\n",
|
|
file,line,mp->file,mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->count--;
|
|
#ifdef __WIN__
|
|
pthread_mutex_unlock(&mp->mutex);
|
|
error=0;
|
|
#else
|
|
error=pthread_mutex_unlock(&mp->mutex);
|
|
if (error)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when trying to unlock mutex at %s, line %d\n", error, errno, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
#endif /* __WIN__ */
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp, const char *file,
|
|
uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count == 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait on a unlocked mutex at %s, line %d\n",file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (!pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait on a mutex at %s, line %d that was locked by another thread at: %s, line: %d\n",
|
|
file,line,mp->file,mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
|
|
if (mp->count-- != 1)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Count was %d on locked mutex at %s, line %d\n",
|
|
mp->count+1, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_cond_wait(cond,&mp->mutex);
|
|
pthread_mutex_lock(&mp->global);
|
|
if (error)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when doing a safe_mutex_wait at %s, line %d\n", error, errno, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread %lx when locking mutex at %s, line %d\n",
|
|
mp->count-1, my_thread_id(), file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= (char*) file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
|
|
struct timespec *abstime,
|
|
const char *file, uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count != 1 || !pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait at %s, line %d on a not hold mutex\n",file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->count--; /* Mutex will be released */
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_cond_timedwait(cond,&mp->mutex,abstime);
|
|
#ifdef EXTRA_DEBUG
|
|
if (error && (error != EINTR && error != ETIMEDOUT))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when doing a safe_mutex_timedwait at %s, line %d\n", error, errno, file, line);
|
|
}
|
|
#endif
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread %lx when locking mutex at %s, line %d (error: %d (%d))\n",
|
|
mp->count-1, my_thread_id(), file, line, error, error);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= (char*) file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
int safe_mutex_destroy(safe_mutex_t *mp, const char *file, uint line)
|
|
{
|
|
int error=0;
|
|
if (mp->count != 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to destroy a mutex that was locked at %s, line %d at %s, line %d\n",
|
|
mp->file,mp->line, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
#ifdef __WIN__
|
|
pthread_mutex_destroy(&mp->global);
|
|
pthread_mutex_destroy(&mp->mutex);
|
|
#else
|
|
if (pthread_mutex_destroy(&mp->global))
|
|
error=1;
|
|
if (pthread_mutex_destroy(&mp->mutex))
|
|
error=1;
|
|
#endif
|
|
return error;
|
|
}
|
|
|
|
#endif /* THREAD && SAFE_MUTEX */
|