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
466ceba6
Commit
466ceba6
authored
Mar 27, 2013
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-26: Global transaction ID.
Silence compiler warning.
parent
f66e3474
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
sql/mysqld.cc
sql/mysqld.cc
+6
-3
No files found.
sql/mysqld.cc
View file @
466ceba6
...
@@ -6682,6 +6682,7 @@ static int show_slave_running(THD *thd, SHOW_VAR *var, char *buff)
...
@@ -6682,6 +6682,7 @@ static int show_slave_running(THD *thd, SHOW_VAR *var, char *buff)
{
{
Master_info
*
mi
;
Master_info
*
mi
;
bool
tmp
;
bool
tmp
;
LINT_INIT
(
tmp
);
var
->
type
=
SHOW_MY_BOOL
;
var
->
type
=
SHOW_MY_BOOL
;
var
->
value
=
buff
;
var
->
value
=
buff
;
...
@@ -6707,6 +6708,7 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff)
...
@@ -6707,6 +6708,7 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff)
{
{
Master_info
*
mi
;
Master_info
*
mi
;
longlong
tmp
;
longlong
tmp
;
LINT_INIT
(
tmp
);
var
->
type
=
SHOW_LONGLONG
;
var
->
type
=
SHOW_LONGLONG
;
var
->
value
=
buff
;
var
->
value
=
buff
;
...
@@ -6730,7 +6732,8 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff)
...
@@ -6730,7 +6732,8 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff)
static
int
show_heartbeat_period
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
static
int
show_heartbeat_period
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
{
{
Master_info
*
mi
;
Master_info
*
mi
;
float
heartbeat_period
;
float
tmp
;
LINT_INIT
(
tmp
);
var
->
type
=
SHOW_CHAR
;
var
->
type
=
SHOW_CHAR
;
var
->
value
=
buff
;
var
->
value
=
buff
;
...
@@ -6740,11 +6743,11 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
...
@@ -6740,11 +6743,11 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
get_master_info
(
&
thd
->
variables
.
default_master_connection
,
get_master_info
(
&
thd
->
variables
.
default_master_connection
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
);
MYSQL_ERROR
::
WARN_LEVEL_NOTE
);
if
(
mi
)
if
(
mi
)
heartbeat_period
=
mi
->
heartbeat_period
;
tmp
=
mi
->
heartbeat_period
;
mysql_mutex_unlock
(
&
LOCK_active_mi
);
mysql_mutex_unlock
(
&
LOCK_active_mi
);
mysql_mutex_lock
(
&
LOCK_status
);
mysql_mutex_lock
(
&
LOCK_status
);
if
(
mi
)
if
(
mi
)
sprintf
(
buff
,
"%.3f"
,
heartbeat_period
);
sprintf
(
buff
,
"%.3f"
,
tmp
);
else
else
var
->
type
=
SHOW_UNDEF
;
var
->
type
=
SHOW_UNDEF
;
return
0
;
return
0
;
...
...
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