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
81194444
Commit
81194444
authored
Jul 03, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B28983-2-5.0-opt
parents
b0696f54
841cf405
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sql/log.cc
sql/log.cc
+5
-5
No files found.
sql/log.cc
View file @
81194444
...
...
@@ -85,7 +85,7 @@ bool binlog_init()
static
int
binlog_close_connection
(
THD
*
thd
)
{
IO_CACHE
*
trans_log
=
(
IO_CACHE
*
)
thd
->
ha_data
[
binlog_hton
.
slot
];
DBUG_ASSERT
(
mysql_bin_log
.
is_open
()
&&
!
my_b_tell
(
trans_log
));
DBUG_ASSERT
(
!
my_b_tell
(
trans_log
));
close_cached_file
(
trans_log
);
my_free
((
gptr
)
trans_log
,
MYF
(
0
));
return
0
;
...
...
@@ -126,7 +126,7 @@ static int binlog_commit(THD *thd, bool all)
{
IO_CACHE
*
trans_log
=
(
IO_CACHE
*
)
thd
->
ha_data
[
binlog_hton
.
slot
];
DBUG_ENTER
(
"binlog_commit"
);
DBUG_ASSERT
(
mysql_bin_log
.
is_open
()
&&
DBUG_ASSERT
(
(
all
||
!
(
thd
->
options
&
(
OPTION_NOT_AUTOCOMMIT
|
OPTION_BEGIN
))));
if
(
my_b_tell
(
trans_log
)
==
0
)
...
...
@@ -155,7 +155,7 @@ static int binlog_rollback(THD *thd, bool all)
unnecessary, doing extra work. The cause should be found and eliminated
*/
DBUG_ASSERT
(
all
||
!
(
thd
->
options
&
(
OPTION_NOT_AUTOCOMMIT
|
OPTION_BEGIN
)));
DBUG_ASSERT
(
my
sql_bin_log
.
is_open
()
&&
my
_b_tell
(
trans_log
));
DBUG_ASSERT
(
my_b_tell
(
trans_log
));
/*
Update the binary log with a BEGIN/ROLLBACK block if we have
cached some queries and we updated some non-transactional
...
...
@@ -198,7 +198,7 @@ static int binlog_savepoint_set(THD *thd, void *sv)
{
IO_CACHE
*
trans_log
=
(
IO_CACHE
*
)
thd
->
ha_data
[
binlog_hton
.
slot
];
DBUG_ENTER
(
"binlog_savepoint_set"
);
DBUG_ASSERT
(
my
sql_bin_log
.
is_open
()
&&
my
_b_tell
(
trans_log
));
DBUG_ASSERT
(
my_b_tell
(
trans_log
));
*
(
my_off_t
*
)
sv
=
my_b_tell
(
trans_log
);
/* Write it to the binary log */
...
...
@@ -210,7 +210,7 @@ static int binlog_savepoint_rollback(THD *thd, void *sv)
{
IO_CACHE
*
trans_log
=
(
IO_CACHE
*
)
thd
->
ha_data
[
binlog_hton
.
slot
];
DBUG_ENTER
(
"binlog_savepoint_rollback"
);
DBUG_ASSERT
(
my
sql_bin_log
.
is_open
()
&&
my
_b_tell
(
trans_log
));
DBUG_ASSERT
(
my_b_tell
(
trans_log
));
/*
Write ROLLBACK TO SAVEPOINT to the binlog cache if we have updated some
...
...
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