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
cf031388
Commit
cf031388
authored
Dec 22, 2004
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
parents
8b929bc9
8fb20802
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
server-tools/instance-manager/mysql_connection.cc
server-tools/instance-manager/mysql_connection.cc
+0
-1
server-tools/instance-manager/parse.cc
server-tools/instance-manager/parse.cc
+0
-1
server-tools/instance-manager/thread_registry.cc
server-tools/instance-manager/thread_registry.cc
+3
-2
server-tools/instance-manager/user_map.cc
server-tools/instance-manager/user_map.cc
+0
-1
No files found.
server-tools/instance-manager/mysql_connection.cc
View file @
cf031388
...
...
@@ -296,7 +296,6 @@ int Mysql_connection_thread::check_user(const char *user, const char *password)
int
Mysql_connection_thread
::
do_command
()
{
char
*
packet
;
uint
old_timeout
;
ulong
packet_length
;
/* We start to count packets from 0 for each new command */
...
...
server-tools/instance-manager/parse.cc
View file @
cf031388
...
...
@@ -131,7 +131,6 @@ Command *parse_command(Command_factory *factory, const char *text)
const
char
*
instance_name
;
uint
instance_name_len
;
Command
*
command
;
const
char
*
saved_text
=
text
;
Token
tok1
=
shift_token
(
&
text
,
&
word_len
);
...
...
server-tools/instance-manager/thread_registry.cc
View file @
cf031388
...
...
@@ -148,6 +148,7 @@ int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond,
void
Thread_registry
::
deliver_shutdown
()
{
Thread_info
*
info
;
struct
timespec
shutdown_time
;
set_timespec
(
shutdown_time
,
1
);
...
...
@@ -161,7 +162,7 @@ void Thread_registry::deliver_shutdown()
stopped alarm processing.
*/
process_alarm
(
THR_SERVER_ALARM
);
for
(
Thread_info
*
info
=
head
.
next
;
info
!=
&
head
;
info
=
info
->
next
)
for
(
info
=
head
.
next
;
info
!=
&
head
;
info
=
info
->
next
)
{
pthread_kill
(
info
->
thread_id
,
THREAD_KICK_OFF_SIGNAL
);
/*
...
...
@@ -190,7 +191,7 @@ void Thread_registry::deliver_shutdown()
so this time everybody should be informed (presumably each worker can
get CPU during shutdown_time.)
*/
for
(
Thread_info
*
info
=
head
.
next
;
info
!=
&
head
;
info
=
info
->
next
)
for
(
info
=
head
.
next
;
info
!=
&
head
;
info
=
info
->
next
)
{
pthread_kill
(
info
->
thread_id
,
THREAD_KICK_OFF_SIGNAL
);
if
(
info
->
current_cond
)
...
...
server-tools/instance-manager/user_map.cc
View file @
cf031388
...
...
@@ -123,7 +123,6 @@ int User_map::load(const char *password_file_name)
1
+
/* for ':' */
1
+
/* for newline */
1
];
/* for trailing zero */
uint
line_length
;
User
*
user
;
int
rc
=
1
;
...
...
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