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
c8a91588
Commit
c8a91588
authored
Dec 11, 2000
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
I hope I've fixed all the bugs by now, let's test it
parent
a4f853e2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
7 deletions
+27
-7
sql/log_event.h
sql/log_event.h
+10
-0
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+2
-1
sql/slave.cc
sql/slave.cc
+9
-3
sql/sql_repl.cc
sql/sql_repl.cc
+5
-2
No files found.
sql/log_event.h
View file @
c8a91588
...
@@ -65,6 +65,16 @@ public:
...
@@ -65,6 +65,16 @@ public:
int
valid_exec_time
;
// if false, the exec time setting is bogus
int
valid_exec_time
;
// if false, the exec time setting is bogus
uint32
server_id
;
uint32
server_id
;
static
void
*
operator
new
(
size_t
size
)
{
return
(
void
*
)
my_malloc
((
uint
)
size
,
MYF
(
MY_WME
|
MY_FAE
));
}
static
void
operator
delete
(
void
*
ptr
,
size_t
size
)
{
my_free
((
byte
*
)
ptr
,
MYF
(
MY_WME
|
MY_ALLOW_ZERO_PTR
));
}
int
write
(
IO_CACHE
*
file
);
int
write
(
IO_CACHE
*
file
);
int
write_header
(
IO_CACHE
*
file
);
int
write_header
(
IO_CACHE
*
file
);
virtual
int
write_data
(
IO_CACHE
*
file
__attribute__
((
unused
)))
{
return
0
;
}
virtual
int
write_data
(
IO_CACHE
*
file
__attribute__
((
unused
)))
{
return
0
;
}
...
...
sql/mysql_priv.h
View file @
c8a91588
...
@@ -486,7 +486,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,
...
@@ -486,7 +486,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,
LOCK_delayed_status
,
LOCK_delayed_create
,
LOCK_crypt
,
LOCK_timezone
,
LOCK_delayed_status
,
LOCK_delayed_create
,
LOCK_crypt
,
LOCK_timezone
,
LOCK_binlog_update
,
LOCK_slave
,
LOCK_server_id
;
LOCK_binlog_update
,
LOCK_slave
,
LOCK_server_id
;
extern
pthread_cond_t
COND_refresh
,
COND_thread_count
,
COND_binlog_update
,
extern
pthread_cond_t
COND_refresh
,
COND_thread_count
,
COND_binlog_update
,
COND_slave_stopped
;
COND_slave_stopped
,
COND_slave_start
;
extern
pthread_attr_t
connection_attrib
;
extern
pthread_attr_t
connection_attrib
;
extern
bool
opt_endinfo
,
using_udf_functions
,
locked_in_memory
;
extern
bool
opt_endinfo
,
using_udf_functions
,
locked_in_memory
;
extern
ulong
ha_read_count
,
ha_write_count
,
ha_delete_count
,
ha_update_count
,
extern
ulong
ha_read_count
,
ha_write_count
,
ha_delete_count
,
ha_update_count
,
...
...
sql/mysqld.cc
View file @
c8a91588
...
@@ -263,7 +263,7 @@ pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count,
...
@@ -263,7 +263,7 @@ pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count,
LOCK_binlog_update
,
LOCK_slave
,
LOCK_server_id
;
LOCK_binlog_update
,
LOCK_slave
,
LOCK_server_id
;
pthread_cond_t
COND_refresh
,
COND_thread_count
,
COND_binlog_update
,
pthread_cond_t
COND_refresh
,
COND_thread_count
,
COND_binlog_update
,
COND_slave_stopped
;
COND_slave_stopped
,
COND_slave_start
;
pthread_cond_t
COND_thread_cache
,
COND_flush_thread_cache
;
pthread_cond_t
COND_thread_cache
,
COND_flush_thread_cache
;
pthread_t
signal_thread
;
pthread_t
signal_thread
;
pthread_attr_t
connection_attrib
;
pthread_attr_t
connection_attrib
;
...
@@ -1414,6 +1414,7 @@ int main(int argc, char **argv)
...
@@ -1414,6 +1414,7 @@ int main(int argc, char **argv)
(
void
)
pthread_mutex_init
(
&
LOCK_server_id
,
NULL
);
(
void
)
pthread_mutex_init
(
&
LOCK_server_id
,
NULL
);
(
void
)
pthread_cond_init
(
&
COND_binlog_update
,
NULL
);
(
void
)
pthread_cond_init
(
&
COND_binlog_update
,
NULL
);
(
void
)
pthread_cond_init
(
&
COND_slave_stopped
,
NULL
);
(
void
)
pthread_cond_init
(
&
COND_slave_stopped
,
NULL
);
(
void
)
pthread_cond_init
(
&
COND_slave_start
,
NULL
);
if
(
set_default_charset_by_name
(
default_charset
,
MYF
(
MY_WME
)))
if
(
set_default_charset_by_name
(
default_charset
,
MYF
(
MY_WME
)))
unireg_abort
(
1
);
unireg_abort
(
1
);
...
...
sql/slave.cc
View file @
c8a91588
...
@@ -938,8 +938,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
...
@@ -938,8 +938,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
return
1
;
return
1
;
}
}
free_root
(
&
thd
->
mem_root
,
0
);
delete
ev
;
delete
ev
;
free_root
(
&
thd
->
mem_root
,
0
);
if
(
thd
->
fatal_error
)
if
(
thd
->
fatal_error
)
{
{
...
@@ -957,12 +957,14 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
...
@@ -957,12 +957,14 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
close_temporary_tables
(
thd
);
close_temporary_tables
(
thd
);
mi
->
inc_pos
(
event_len
);
mi
->
inc_pos
(
event_len
);
flush_master_info
(
mi
);
flush_master_info
(
mi
);
delete
ev
;
break
;
break
;
case
STOP_EVENT
:
case
STOP_EVENT
:
close_temporary_tables
(
thd
);
close_temporary_tables
(
thd
);
mi
->
inc_pos
(
event_len
);
mi
->
inc_pos
(
event_len
);
flush_master_info
(
mi
);
flush_master_info
(
mi
);
delete
ev
;
break
;
break
;
case
ROTATE_EVENT
:
case
ROTATE_EVENT
:
{
{
...
@@ -1013,15 +1015,18 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1013,15 +1015,18 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
THD
*
thd
;
// needs to be first for thread_stack
THD
*
thd
;
// needs to be first for thread_stack
MYSQL
*
mysql
=
NULL
;
MYSQL
*
mysql
=
NULL
;
pthread_mutex_lock
(
&
LOCK_slave
);
if
(
!
server_id
)
if
(
!
server_id
)
{
{
pthread_cond_broadcast
(
&
COND_slave_start
);
pthread_mutex_unlock
(
&
LOCK_slave
);
sql_print_error
(
"Server id not set, will not start slave"
);
sql_print_error
(
"Server id not set, will not start slave"
);
pthread_exit
((
void
*
)
1
);
pthread_exit
((
void
*
)
1
);
}
}
pthread_mutex_lock
(
&
LOCK_slave
);
if
(
slave_running
)
if
(
slave_running
)
{
{
pthread_cond_broadcast
(
&
COND_slave_start
);
pthread_mutex_unlock
(
&
LOCK_slave
);
pthread_mutex_unlock
(
&
LOCK_slave
);
pthread_exit
((
void
*
)
1
);
// safety just in case
pthread_exit
((
void
*
)
1
);
// safety just in case
}
}
...
@@ -1030,7 +1035,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
...
@@ -1030,7 +1035,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
#ifndef DBUG_OFF
#ifndef DBUG_OFF
events_till_abort
=
abort_slave_event_count
;
events_till_abort
=
abort_slave_event_count
;
#endif
#endif
pthread_mutex_unlock
(
&
LOCK_slave
);
pthread_cond_broadcast
(
&
COND_slave_start
);
pthread_mutex_unlock
(
&
LOCK_slave
);
int
error
=
1
;
int
error
=
1
;
bool
retried_once
=
0
;
bool
retried_once
=
0
;
...
...
sql/sql_repl.cc
View file @
c8a91588
...
@@ -34,7 +34,7 @@ static int send_file(THD *thd)
...
@@ -34,7 +34,7 @@ static int send_file(THD *thd)
char
fname
[
FN_REFLEN
+
1
];
char
fname
[
FN_REFLEN
+
1
];
char
*
buf
;
char
*
buf
;
const
char
*
errmsg
=
0
;
const
char
*
errmsg
=
0
;
int
old_timeout
;
int
old_timeout
,
fname_len
;
DBUG_ENTER
(
"send_file"
);
DBUG_ENTER
(
"send_file"
);
// the client might be slow loading the data, give him wait_timeout to do
// the client might be slow loading the data, give him wait_timeout to do
...
@@ -51,12 +51,14 @@ static int send_file(THD *thd)
...
@@ -51,12 +51,14 @@ static int send_file(THD *thd)
// we need net_flush here because the client will not know it needs to send
// we need net_flush here because the client will not know it needs to send
// us the file name until it has processed the load event entry
// us the file name until it has processed the load event entry
if
(
net_flush
(
net
)
||
my_net_read
(
net
)
==
packet_error
)
if
(
net_flush
(
net
)
||
(
fname_len
=
my_net_read
(
net
)
)
==
packet_error
)
{
{
errmsg
=
"Failed reading file name"
;
errmsg
=
"Failed reading file name"
;
goto
err
;
goto
err
;
}
}
*
((
char
*
)
net
->
read_pos
+
1
+
fname_len
)
=
0
;
// terminate with \0
//for fn_format
fn_format
(
fname
,
(
char
*
)
net
->
read_pos
+
1
,
""
,
""
,
4
);
fn_format
(
fname
,
(
char
*
)
net
->
read_pos
+
1
,
""
,
""
,
4
);
// this is needed to make replicate-ignore-db
// this is needed to make replicate-ignore-db
if
(
!
strcmp
(
fname
,
"/dev/null"
))
if
(
!
strcmp
(
fname
,
"/dev/null"
))
...
@@ -513,6 +515,7 @@ int start_slave(THD* thd , bool net_report)
...
@@ -513,6 +515,7 @@ int start_slave(THD* thd , bool net_report)
{
{
err
=
"cannot create slave thread"
;
err
=
"cannot create slave thread"
;
}
}
pthread_cond_wait
(
&
COND_slave_start
,
&
LOCK_slave
);
}
}
else
else
err
=
"Master host not set, or server id not configured"
;
err
=
"Master host not set, or server id not configured"
;
...
...
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