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
71373afb
Commit
71373afb
authored
Jul 02, 2003
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug #672
client/mysqlbinlog.cc: changed format of eof-packet for protocol 4.1
parent
32592ab8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
client/mysqlbinlog.cc
client/mysqlbinlog.cc
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+2
-1
sql/sql_repl.cc
sql/sql_repl.cc
+7
-1
No files found.
client/mysqlbinlog.cc
View file @
71373afb
...
...
@@ -360,7 +360,7 @@ static void dump_remote_log_entries(const char* logname)
len
=
net_safe_read
(
mysql
);
if
(
len
==
packet_error
)
die
(
"Error reading packet from server: %s"
,
mysql_error
(
mysql
));
if
(
len
==
1
&&
net
->
read_pos
[
0
]
==
254
)
if
(
len
<
8
&&
net
->
read_pos
[
0
]
==
254
)
break
;
// end of data
DBUG_PRINT
(
"info"
,(
"len= %u, net->read_pos[5] = %d
\n
"
,
len
,
net
->
read_pos
[
5
]));
...
...
sql/sql_parse.cc
View file @
71373afb
...
...
@@ -1147,7 +1147,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
pos
=
uint4korr
(
packet
);
flags
=
uint2korr
(
packet
+
4
);
thd
->
server_id
=
0
;
/* avoid suicide */
kill_zombie_dump_threads
(
slave_server_id
=
uint4korr
(
packet
+
6
));
if
((
slave_server_id
=
uint4korr
(
packet
+
6
)))
kill_zombie_dump_threads
(
slave_server_id
);
thd
->
server_id
=
slave_server_id
;
mysql_binlog_send
(
thd
,
thd
->
strdup
(
packet
+
10
),
(
my_off_t
)
pos
,
flags
);
unregister_slave
(
thd
,
1
,
1
);
...
...
sql/sql_repl.cc
View file @
71373afb
...
...
@@ -503,6 +503,11 @@ Increase max_allowed_packet on master";
case
LOG_READ_EOF
:
DBUG_PRINT
(
"wait"
,(
"waiting for data in binary log"
));
if
(
thd
->
server_id
==
0
)
{
pthread_mutex_unlock
(
log_lock
);
goto
end
;
}
if
(
!
thd
->
killed
)
{
/* Note that the following call unlocks lock_log */
...
...
@@ -590,6 +595,7 @@ Increase max_allowed_packet on master";
}
}
end:
end_io_cache
(
&
log
);
(
void
)
my_close
(
file
,
MYF
(
MY_WME
));
...
...
@@ -600,7 +606,7 @@ Increase max_allowed_packet on master";
pthread_mutex_unlock
(
&
LOCK_thread_count
);
DBUG_VOID_RETURN
;
err:
err:
thd
->
proc_info
=
"waiting to finalize termination"
;
end_io_cache
(
&
log
);
/*
...
...
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