database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Simple fixes (nothing notable)

Browse Source 
dbug/dbug.c:
  Remove duplicate va_end() call
mysql-test/mysql-test-run.sh:
  Longer stack trace from valgrind
mysys/my_lib.c:
  Fixed wrong dbug printf
sql/slave.cc:
  Simple optimization
sql/sql_class.cc:
  Added DBUG info
This commit is contained in:
unknown
2003-03-12 01:40:06 +02:00
parent 6361cd89fc
commit fa4f6e8998
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbug/dbug.c
View File

@ -919,7 +919,6 @@ void _db_doprnt_ (const char *format,...)
}
(void) fprintf (_db_fp_, "%s: ", state->u_keyword);
(void) vfprintf (_db_fp_, format, args);
va_end(args);
(void) fputc('\n',_db_fp_);
dbug_flush(state);
errno=save_errno;

2
mysql-test/mysql-test-run.sh
View File

@ -326,7 +326,7 @@ while test $# -gt 0; do
USE_RUNNING_SERVER=""
;;
--valgrind)
VALGRIND="valgrind --alignment=8 --leak-check=yes"
VALGRIND="valgrind --alignment=8 --leak-check=yes --num-callers=16"
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc"
SLEEP_TIME_AFTER_RESTART=10

2
mysys/my_lib.c
View File

@ -103,7 +103,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
char dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
#endif
DBUG_ENTER("my_dir");
DBUG_PRINT("my",("path: '%s' stat: %d MyFlags: %d",path,MyFlags));
DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags));
#if defined(THREAD) && !defined(HAVE_READDIR_R)
pthread_mutex_lock(&THR_LOCK_open);

10
sql/slave.cc
View File

@ -443,12 +443,10 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
be referening freed memory trying to kick it
*/
THD_CHECK_SENTRY(thd);
if (*slave_running)
while (*slave_running) // Should always be true
{
KICK_SLAVE(thd);
}
while (*slave_running)
{
/*
There is a small chance that slave thread might miss the first
alarm. To protect againts it, resend the signal until it reacts
@ -456,10 +454,6 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
struct timespec abstime;
set_timespec(abstime,2);
pthread_cond_timedwait(term_cond, cond_lock, &abstime);
if (*slave_running)
{
KICK_SLAVE(thd);
}
}
if (term_lock)
pthread_mutex_unlock(term_lock);

2
sql/sql_class.cc
View File

@ -419,12 +419,14 @@ CHANGED_TABLE_LIST* THD::changed_table_dup(const char *key, long key_length)
#ifdef SIGNAL_WITH_VIO_CLOSE
void THD::close_active_vio()
{
DBUG_ENTER("close_active_vio");
safe_mutex_assert_owner(&LOCK_delete);
if (active_vio)
{
vio_close(active_vio);
active_vio = 0;
}
DBUG_RETURN;
}
#endif