Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
8edc7525
Commit
8edc7525
authored
21 years ago
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simple fixes (nothing notable)
parent
7fdf7a41
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
14 deletions
+9
-14
dbug/dbug.c
dbug/dbug.c
+0
-1
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+1
-1
mysys/my_lib.c
mysys/my_lib.c
+1
-1
sql/slave.cc
sql/slave.cc
+5
-11
sql/sql_class.cc
sql/sql_class.cc
+2
-0
No files found.
dbug/dbug.c
View file @
8edc7525
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.sh
View file @
8edc7525
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mysys/my_lib.c
View file @
8edc7525
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sql/slave.cc
View file @
8edc7525
...
...
@@ -401,9 +401,9 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock)
DBUG_PRINT
(
"info"
,(
"Terminating IO thread"
));
mi
->
abort_slave
=
1
;
if
((
error
=
terminate_slave_thread
(
mi
->
io_thd
,
io_lock
,
io_cond_lock
,
&
mi
->
stop_cond
,
&
mi
->
slave_running
))
&&
io_cond_lock
,
&
mi
->
stop_cond
,
&
mi
->
slave_running
))
&&
!
force_all
)
DBUG_RETURN
(
error
);
}
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.cc
View file @
8edc7525
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment