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
492c3b09
Commit
492c3b09
authored
Mar 01, 2013
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile error when building with DBUG, but without DEBUG_SYNC.
parent
1a998ee2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
sql/slave.cc
sql/slave.cc
+6
-0
sql/sql_parse.cc
sql/sql_parse.cc
+2
-0
sql/sql_repl.cc
sql/sql_repl.cc
+2
-0
No files found.
sql/slave.cc
View file @
492c3b09
...
@@ -1334,6 +1334,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
...
@@ -1334,6 +1334,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
unavailable (very old master not supporting UNIX_TIMESTAMP()?).
unavailable (very old master not supporting UNIX_TIMESTAMP()?).
*/
*/
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"dbug.before_get_UNIX_TIMESTAMP"
,
DBUG_EXECUTE_IF
(
"dbug.before_get_UNIX_TIMESTAMP"
,
{
{
const
char
act
[]
=
const
char
act
[]
=
...
@@ -1343,6 +1344,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
...
@@ -1343,6 +1344,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
DBUG_ASSERT
(
!
debug_sync_set_action
(
current_thd
,
DBUG_ASSERT
(
!
debug_sync_set_action
(
current_thd
,
STRING_WITH_LEN
(
act
)));
STRING_WITH_LEN
(
act
)));
};);
};);
#endif
master_res
=
NULL
;
master_res
=
NULL
;
if
(
!
mysql_real_query
(
mysql
,
STRING_WITH_LEN
(
"SELECT UNIX_TIMESTAMP()"
))
&&
if
(
!
mysql_real_query
(
mysql
,
STRING_WITH_LEN
(
"SELECT UNIX_TIMESTAMP()"
))
&&
...
@@ -1384,6 +1386,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
...
@@ -1384,6 +1386,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
Note: we could have put a @@SERVER_ID in the previous SELECT
Note: we could have put a @@SERVER_ID in the previous SELECT
UNIX_TIMESTAMP() instead, but this would not have worked on 3.23 masters.
UNIX_TIMESTAMP() instead, but this would not have worked on 3.23 masters.
*/
*/
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"dbug.before_get_SERVER_ID"
,
DBUG_EXECUTE_IF
(
"dbug.before_get_SERVER_ID"
,
{
{
const
char
act
[]
=
const
char
act
[]
=
...
@@ -1393,6 +1396,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
...
@@ -1393,6 +1396,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
DBUG_ASSERT
(
!
debug_sync_set_action
(
current_thd
,
DBUG_ASSERT
(
!
debug_sync_set_action
(
current_thd
,
STRING_WITH_LEN
(
act
)));
STRING_WITH_LEN
(
act
)));
};);
};);
#endif
master_res
=
NULL
;
master_res
=
NULL
;
master_row
=
NULL
;
master_row
=
NULL
;
if
(
!
mysql_real_query
(
mysql
,
if
(
!
mysql_real_query
(
mysql
,
...
@@ -3081,6 +3085,7 @@ pthread_handler_t handle_slave_io(void *arg)
...
@@ -3081,6 +3085,7 @@ pthread_handler_t handle_slave_io(void *arg)
connected:
connected:
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"dbug.before_get_running_status_yes"
,
DBUG_EXECUTE_IF
(
"dbug.before_get_running_status_yes"
,
{
{
const
char
act
[]
=
const
char
act
[]
=
...
@@ -3090,6 +3095,7 @@ connected:
...
@@ -3090,6 +3095,7 @@ connected:
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
STRING_WITH_LEN
(
act
)));
STRING_WITH_LEN
(
act
)));
};);
};);
#endif
// TODO: the assignment below should be under mutex (5.0)
// TODO: the assignment below should be under mutex (5.0)
mi
->
slave_running
=
MYSQL_SLAVE_RUN_CONNECT
;
mi
->
slave_running
=
MYSQL_SLAVE_RUN_CONNECT
;
...
...
sql/sql_parse.cc
View file @
492c3b09
...
@@ -2944,6 +2944,7 @@ end_with_restore_list:
...
@@ -2944,6 +2944,7 @@ end_with_restore_list:
thd
->
first_successful_insert_id_in_cur_stmt
=
thd
->
first_successful_insert_id_in_cur_stmt
=
thd
->
first_successful_insert_id_in_prev_stmt
;
thd
->
first_successful_insert_id_in_prev_stmt
;
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"after_mysql_insert"
,
DBUG_EXECUTE_IF
(
"after_mysql_insert"
,
{
{
const
char
act1
[]
=
const
char
act1
[]
=
...
@@ -2959,6 +2960,7 @@ end_with_restore_list:
...
@@ -2959,6 +2960,7 @@ end_with_restore_list:
STRING_WITH_LEN
(
act2
)));
STRING_WITH_LEN
(
act2
)));
};);
};);
DEBUG_SYNC
(
thd
,
"after_mysql_insert"
);
DEBUG_SYNC
(
thd
,
"after_mysql_insert"
);
#endif
break
;
break
;
}
}
case
SQLCOM_REPLACE_SELECT
:
case
SQLCOM_REPLACE_SELECT
:
...
...
sql/sql_repl.cc
View file @
492c3b09
...
@@ -897,6 +897,7 @@ impossible position";
...
@@ -897,6 +897,7 @@ impossible position";
event_type
=
event_type
=
(
Log_event_type
)((
uchar
)(
*
packet
)[
LOG_EVENT_OFFSET
+
ev_offset
]);
(
Log_event_type
)((
uchar
)(
*
packet
)[
LOG_EVENT_OFFSET
+
ev_offset
]);
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"dump_thread_wait_before_send_xid"
,
DBUG_EXECUTE_IF
(
"dump_thread_wait_before_send_xid"
,
{
{
if
(
event_type
==
XID_EVENT
)
if
(
event_type
==
XID_EVENT
)
...
@@ -915,6 +916,7 @@ impossible position";
...
@@ -915,6 +916,7 @@ impossible position";
STRING_WITH_LEN
(
act2
)));
STRING_WITH_LEN
(
act2
)));
}
}
});
});
#endif
if
(
event_type
==
FORMAT_DESCRIPTION_EVENT
)
if
(
event_type
==
FORMAT_DESCRIPTION_EVENT
)
{
{
current_checksum_alg
=
get_checksum_alg
(
packet
->
ptr
()
+
ev_offset
,
current_checksum_alg
=
get_checksum_alg
(
packet
->
ptr
()
+
ev_offset
,
...
...
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