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
a4f6871d
Commit
a4f6871d
authored
Jun 23, 2006
by
monty@hasky.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge monty@192.168.0.9:/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1
parents
14e05051
fba475cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
sql/handler.h
sql/handler.h
+6
-6
sql/sql_class.h
sql/sql_class.h
+6
-2
No files found.
sql/handler.h
View file @
a4f6871d
...
@@ -1646,10 +1646,10 @@ void ha_binlog_log_query(THD *thd, const handlerton *db_type,
...
@@ -1646,10 +1646,10 @@ void ha_binlog_log_query(THD *thd, const handlerton *db_type,
void
ha_binlog_wait
(
THD
*
thd
);
void
ha_binlog_wait
(
THD
*
thd
);
int
ha_binlog_end
(
THD
*
thd
);
int
ha_binlog_end
(
THD
*
thd
);
#else
#else
#define ha_reset_logs(a)
0
#define ha_reset_logs(a)
do {} while (0)
#define ha_binlog_index_purge_file(a,b)
0
#define ha_binlog_index_purge_file(a,b)
do {} while (0)
#define ha_reset_slave(a)
#define ha_reset_slave(a)
do {} while (0)
#define ha_binlog_log_query(a,b,c,d,e,f,g)
;
#define ha_binlog_log_query(a,b,c,d,e,f,g)
do {} while (0)
#define ha_binlog_wait(a)
#define ha_binlog_wait(a)
do {} while (0)
#define ha_binlog_end(a)
0
#define ha_binlog_end(a)
do {} while (0)
#endif
#endif
sql/sql_class.h
View file @
a4f6871d
...
@@ -1415,21 +1415,25 @@ public:
...
@@ -1415,21 +1415,25 @@ public:
void
restore_sub_statement_state
(
Sub_statement_state
*
backup
);
void
restore_sub_statement_state
(
Sub_statement_state
*
backup
);
void
set_n_backup_active_arena
(
Query_arena
*
set
,
Query_arena
*
backup
);
void
set_n_backup_active_arena
(
Query_arena
*
set
,
Query_arena
*
backup
);
void
restore_active_arena
(
Query_arena
*
set
,
Query_arena
*
backup
);
void
restore_active_arena
(
Query_arena
*
set
,
Query_arena
*
backup
);
#ifdef HAVE_ROW_BASED_REPLICATION
inline
void
set_current_stmt_binlog_row_based_if_mixed
()
inline
void
set_current_stmt_binlog_row_based_if_mixed
()
{
{
#ifdef HAVE_ROW_BASED_REPLICATION
if
(
variables
.
binlog_format
==
BINLOG_FORMAT_MIXED
)
if
(
variables
.
binlog_format
==
BINLOG_FORMAT_MIXED
)
current_stmt_binlog_row_based
=
TRUE
;
current_stmt_binlog_row_based
=
TRUE
;
#endif
}
}
inline
void
set_current_stmt_binlog_row_based
()
inline
void
set_current_stmt_binlog_row_based
()
{
{
#ifdef HAVE_ROW_BASED_REPLICATION
current_stmt_binlog_row_based
=
TRUE
;
current_stmt_binlog_row_based
=
TRUE
;
#endif
}
}
inline
void
clear_current_stmt_binlog_row_based
()
inline
void
clear_current_stmt_binlog_row_based
()
{
{
#ifdef HAVE_ROW_BASED_REPLICATION
current_stmt_binlog_row_based
=
FALSE
;
current_stmt_binlog_row_based
=
FALSE
;
}
#endif
#endif
}
inline
void
reset_current_stmt_binlog_row_based
()
inline
void
reset_current_stmt_binlog_row_based
()
{
{
#ifdef HAVE_ROW_BASED_REPLICATION
#ifdef HAVE_ROW_BASED_REPLICATION
...
...
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