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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1d617f18
Commit
1d617f18
authored
Oct 29, 2003
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
followup to max_user_connections fix, keep the count more accurate
parent
75454930
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
sql/sql_parse.cc
sql/sql_parse.cc
+4
-3
No files found.
sql/sql_parse.cc
View file @
1d617f18
...
@@ -303,14 +303,13 @@ static int check_for_max_user_connections(USER_CONN *uc)
...
@@ -303,14 +303,13 @@ static int check_for_max_user_connections(USER_CONN *uc)
{
{
int
error
=
0
;
int
error
=
0
;
DBUG_ENTER
(
"check_for_max_user_connections"
);
DBUG_ENTER
(
"check_for_max_user_connections"
);
(
void
)
pthread_mutex_lock
(
&
LOCK_user_conn
);
(
void
)
pthread_mutex_lock
(
&
LOCK_user_conn
);
if
(
max_user_connections
&&
if
(
max_user_connections
&&
max_user_connections
<
=
uc
->
connections
)
max_user_connections
<
uc
->
connections
)
{
{
net_printf
(
&
(
current_thd
->
net
),
ER_TOO_MANY_USER_CONNECTIONS
,
uc
->
user
);
net_printf
(
&
(
current_thd
->
net
),
ER_TOO_MANY_USER_CONNECTIONS
,
uc
->
user
);
error
=
1
;
error
=
1
;
uc
->
connections
--
;
goto
end
;
goto
end
;
}
}
if
(
uc
->
user_resources
.
connections
&&
if
(
uc
->
user_resources
.
connections
&&
...
@@ -324,6 +323,8 @@ static int check_for_max_user_connections(USER_CONN *uc)
...
@@ -324,6 +323,8 @@ static int check_for_max_user_connections(USER_CONN *uc)
}
}
uc
->
conn_per_hour
++
;
uc
->
conn_per_hour
++
;
end:
end:
if
(
error
)
uc
->
connections
--
;
// no need for decrease_user_connections() here
(
void
)
pthread_mutex_unlock
(
&
LOCK_user_conn
);
(
void
)
pthread_mutex_unlock
(
&
LOCK_user_conn
);
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
...
...
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