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
671d3e1e
Commit
671d3e1e
authored
Feb 22, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
sql/ha_ndbcluster_binlog.cc: A post-merge fix. sql/log_event.cc: A post-merge fix.
parent
ae8ed9fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_binlog.cc
+2
-1
sql/log_event.cc
sql/log_event.cc
+2
-2
No files found.
sql/ha_ndbcluster_binlog.cc
View file @
671d3e1e
...
@@ -1641,7 +1641,8 @@ int ndb_add_binlog_index(THD *thd, void *_row)
...
@@ -1641,7 +1641,8 @@ int ndb_add_binlog_index(THD *thd, void *_row)
{
{
if
(
need_reopen
)
if
(
need_reopen
)
{
{
close_tables_for_reopen
(
thd
,
&
binlog_tables
);
TABLE_LIST
*
p_binlog_tables
=
&
binlog_tables
;
close_tables_for_reopen
(
thd
,
&
p_binlog_tables
);
binlog_index
=
0
;
binlog_index
=
0
;
continue
;
continue
;
}
}
...
...
sql/log_event.cc
View file @
671d3e1e
...
@@ -5281,6 +5281,7 @@ int Rows_log_event::exec_event(st_relay_log_info *rli)
...
@@ -5281,6 +5281,7 @@ int Rows_log_event::exec_event(st_relay_log_info *rli)
tested replicate-* rules).
tested replicate-* rules).
*/
*/
TABLE_LIST
table_list
;
TABLE_LIST
table_list
;
TABLE_LIST
*
tables
=
&
table_list
;
bool
need_reopen
;
bool
need_reopen
;
uint
count
=
1
;
uint
count
=
1
;
bzero
(
&
table_list
,
sizeof
(
table_list
));
bzero
(
&
table_list
,
sizeof
(
table_list
));
...
@@ -5330,13 +5331,12 @@ int Rows_log_event::exec_event(st_relay_log_info *rli)
...
@@ -5330,13 +5331,12 @@ int Rows_log_event::exec_event(st_relay_log_info *rli)
*/
*/
thd
->
binlog_flush_pending_rows_event
(
false
);
thd
->
binlog_flush_pending_rows_event
(
false
);
close_tables_for_reopen
(
thd
,
&
table
_list
);
close_tables_for_reopen
(
thd
,
&
table
s
);
/* open the table again, same as in Table_map_event::exec_event */
/* open the table again, same as in Table_map_event::exec_event */
table_list
.
db
=
const_cast
<
char
*>
(
db
);
table_list
.
db
=
const_cast
<
char
*>
(
db
);
table_list
.
alias
=
table_list
.
table_name
=
const_cast
<
char
*>
(
table_name
);
table_list
.
alias
=
table_list
.
table_name
=
const_cast
<
char
*>
(
table_name
);
table_list
.
updating
=
1
;
table_list
.
updating
=
1
;
TABLE_LIST
*
tables
=
&
table_list
;
if
((
error
=
open_tables
(
thd
,
&
tables
,
&
count
,
0
))
==
0
)
if
((
error
=
open_tables
(
thd
,
&
tables
,
&
count
,
0
))
==
0
)
{
{
/* reset some variables for the table list*/
/* reset some variables for the table list*/
...
...
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