mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
231 lines
6.7 KiB
C
231 lines
6.7 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; 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\n",
|
|
file,line,mp->file,mp->line);
|
|
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 when trying to unlock mutex at %s, line %d\n", error, 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 when doing a safe_mutex_wait at %s, line %d\n", error, 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 when doing a safe_mutex_timedwait at %s, line %d\n", error, 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)\n",
|
|
mp->count-1, my_thread_id(), file, line, 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 */
|