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
5618b817
Commit
5618b817
authored
Mar 22, 2009
by
Alfranio Correia
Browse files
Options
Browse Files
Download
Plain Diff
auto-merge 5.1-bugteam (local) --> 5.1-bugteam
parents
95c20847
cd4623bc
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
170 additions
and
3 deletions
+170
-3
mysql-test/suite/rpl/r/rpl_slave_load_in.result
mysql-test/suite/rpl/r/rpl_slave_load_in.result
+9
-0
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
+15
-0
mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
...l-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
+6
-0
mysql-test/suite/rpl/t/rpl_slave_load_in.test
mysql-test/suite/rpl/t/rpl_slave_load_in.test
+17
-2
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
...-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
+1
-0
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
+46
-0
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
...est/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
+1
-0
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
+21
-0
sql/log_event.cc
sql/log_event.cc
+11
-1
sql/slave.cc
sql/slave.cc
+43
-0
No files found.
mysql-test/suite/rpl/r/rpl_slave_load_in.result
View file @
5618b817
...
@@ -5,6 +5,15 @@ reset slave;
...
@@ -5,6 +5,15 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
start slave;
create table t1(a int not null auto_increment, b int, primary key(a));
create table t1(a int not null auto_increment, b int, primary key(a));
create table t2(a int not null auto_increment, b int, primary key(a)) engine=innodb;
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
start transaction;
insert into t2(b) values (1);
insert into t2(b) values (2);
load data infile '../../std_data/rpl_loaddata.dat' into table t2;
load data infile '../../std_data/rpl_loaddata.dat' into table t2;
commit;
Comparing tables master:test.t1 and slave:test.t1
Comparing tables master:test.t1 and slave:test.t1
Comparing tables master:test.t2 and slave:test.t2
drop table t1;
drop table t1;
drop table t2;
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
0 → 100644
View file @
5618b817
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
start transaction;
insert into t1(b) values (1);
insert into t1(b) values (2);
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
commit;
Error in Begin_load_query event: write to '../../tmp/SQL_LOAD-2-1-1.data' failed
drop table t1;
drop table t1;
mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
0 → 100644
View file @
5618b817
CHANGE MASTER TO MASTER_USER='root',
MASTER_CONNECT_RETRY=1,
MASTER_HOST='127.0.0.1',
MASTER_PORT=12500;
start slave;
Unable to use slave's temporary directory ../../../error - Can't read dir of '../../../error' (Errcode: 2)
mysql-test/suite/rpl/t/rpl_slave_load_in.test
View file @
5618b817
...
@@ -3,10 +3,11 @@
...
@@ -3,10 +3,11 @@
# event while the "--secure-file-priv" option is set.
# event while the "--secure-file-priv" option is set.
#
#
# The test is divided in two steps:
# The test is divided in two steps:
# 1 - Creates
a table and populates it
through "LOAD DATA INFILE".
# 1 - Creates
tables and populates them
through "LOAD DATA INFILE".
# 2 - Compares the master and slave.
# 2 - Compares the master and slave.
##########################################################################
##########################################################################
source
include
/
master
-
slave
.
inc
;
--
source
include
/
have_innodb
.
inc
--
source
include
/
master
-
slave
.
inc
##########################################################################
##########################################################################
# Loading data
# Loading data
...
@@ -14,8 +15,17 @@ source include/master-slave.inc;
...
@@ -14,8 +15,17 @@ source include/master-slave.inc;
connection
master
;
connection
master
;
create
table
t1
(
a
int
not
null
auto_increment
,
b
int
,
primary
key
(
a
));
create
table
t1
(
a
int
not
null
auto_increment
,
b
int
,
primary
key
(
a
));
create
table
t2
(
a
int
not
null
auto_increment
,
b
int
,
primary
key
(
a
))
engine
=
innodb
;
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t1
;
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t1
;
start
transaction
;
insert
into
t2
(
b
)
values
(
1
);
insert
into
t2
(
b
)
values
(
2
);
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t2
;
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t2
;
commit
;
##########################################################################
##########################################################################
# Checking Consistency
# Checking Consistency
##########################################################################
##########################################################################
...
@@ -25,11 +35,16 @@ let $diff_table_1=master:test.t1;
...
@@ -25,11 +35,16 @@ let $diff_table_1=master:test.t1;
let
$diff_table_2
=
slave
:
test
.
t1
;
let
$diff_table_2
=
slave
:
test
.
t1
;
source
include
/
diff_tables
.
inc
;
source
include
/
diff_tables
.
inc
;
let
$diff_table_1
=
master
:
test
.
t2
;
let
$diff_table_2
=
slave
:
test
.
t2
;
source
include
/
diff_tables
.
inc
;
##########################################################################
##########################################################################
# Clean up
# Clean up
##########################################################################
##########################################################################
connection
master
;
connection
master
;
drop
table
t1
;
drop
table
t1
;
drop
table
t2
;
sync_slave_with_master
;
sync_slave_with_master
;
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
0 → 100644
View file @
5618b817
--loose-debug=d,remove_slave_load_file_before_write
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
0 → 100644
View file @
5618b817
##########################################################################
# This test verifies if the slave fails gracefully when the temporary
# file used to load data is removed while it is about to be used it.
# Similar errors are caught if the temporary directory is removed.
#
# Steps:
# 1 - Creates a table and populates it through "LOAD DATA INFILE".
# 2 - Catches error.
##########################################################################
--
source
include
/
have_binlog_format_mixed_or_statement
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_debug
.
inc
--
source
include
/
master
-
slave
.
inc
##########################################################################
# Loading data
##########################################################################
connection
master
;
create
table
t1
(
a
int
not
null
auto_increment
,
b
int
,
primary
key
(
a
))
engine
=
innodb
;
start
transaction
;
insert
into
t1
(
b
)
values
(
1
);
insert
into
t1
(
b
)
values
(
2
);
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t1
;
commit
;
##########################################################################
# Catch Error
##########################################################################
connection
slave
;
source
include
/
wait_for_slave_sql_to_stop
.
inc
;
let
$error
=
query_get_value
(
"show slave status"
,
Last_SQL_Error
,
1
);
echo
$error
;
##########################################################################
# Clean up
##########################################################################
connection
master
;
drop
table
t1
;
connection
slave
;
drop
table
t1
;
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
0 → 100644
View file @
5618b817
--slave-load-tmpdir=../../../error
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
0 → 100644
View file @
5618b817
##########################################################################
# This test verifies if the start slave fails gracefuly when an
# invalid directory is used to set --slave-load-tmpdir.
##########################################################################
connect
(
master
,
127.0
.
0.1
,
root
,,
test
,
$MASTER_MYPORT
,);
connect
(
master1
,
127.0
.
0.1
,
root
,,
test
,
$MASTER_MYPORT
,);
connect
(
slave
,
127.0
.
0.1
,
root
,,
test
,
$SLAVE_MYPORT
,);
connect
(
slave1
,
127.0
.
0.1
,
root
,,
test
,
$SLAVE_MYPORT
,);
connection
slave
;
eval
CHANGE
MASTER
TO
MASTER_USER
=
'root'
,
MASTER_CONNECT_RETRY
=
1
,
MASTER_HOST
=
'127.0.0.1'
,
MASTER_PORT
=
$MASTER_MYPORT
;
start
slave
;
source
include
/
wait_for_slave_sql_to_stop
.
inc
;
let
$error
=
query_get_value
(
"show slave status"
,
Last_SQL_Error
,
1
);
echo
$error
;
sql/log_event.cc
View file @
5618b817
...
@@ -382,7 +382,7 @@ static void cleanup_load_tmpdir()
...
@@ -382,7 +382,7 @@ static void cleanup_load_tmpdir()
uint
i
;
uint
i
;
char
fname
[
FN_REFLEN
],
prefbuf
[
31
],
*
p
;
char
fname
[
FN_REFLEN
],
prefbuf
[
31
],
*
p
;
if
(
!
(
dirp
=
my_dir
(
slave_load_tmpdir
,
MYF
(
MY_WME
))))
if
(
!
(
dirp
=
my_dir
(
slave_load_tmpdir
,
MYF
(
0
))))
return
;
return
;
/*
/*
...
@@ -6175,6 +6175,12 @@ int Append_block_log_event::do_apply_event(Relay_log_info const *rli)
...
@@ -6175,6 +6175,12 @@ int Append_block_log_event::do_apply_event(Relay_log_info const *rli)
thd_proc_info
(
thd
,
proc_info
);
thd_proc_info
(
thd
,
proc_info
);
if
(
get_create_or_append
())
if
(
get_create_or_append
())
{
{
/*
Usually lex_start() is called by mysql_parse(), but we need it here
as the present method does not call mysql_parse().
*/
lex_start
(
thd
);
mysql_reset_thd_for_next_command
(
thd
);
my_delete
(
fname
,
MYF
(
0
));
// old copy may exist already
my_delete
(
fname
,
MYF
(
0
));
// old copy may exist already
if
((
fd
=
my_create
(
fname
,
CREATE_MODE
,
if
((
fd
=
my_create
(
fname
,
CREATE_MODE
,
O_WRONLY
|
O_BINARY
|
O_EXCL
|
O_NOFOLLOW
,
O_WRONLY
|
O_BINARY
|
O_EXCL
|
O_NOFOLLOW
,
...
@@ -6194,6 +6200,10 @@ int Append_block_log_event::do_apply_event(Relay_log_info const *rli)
...
@@ -6194,6 +6200,10 @@ int Append_block_log_event::do_apply_event(Relay_log_info const *rli)
get_type_str
(),
fname
);
get_type_str
(),
fname
);
goto
err
;
goto
err
;
}
}
DBUG_EXECUTE_IF
(
"remove_slave_load_file_before_write"
,
my_close
(
fd
,
MYF
(
0
));
fd
=
-
1
;
my_delete
(
fname
,
MYF
(
0
)););
if
(
my_write
(
fd
,
(
uchar
*
)
block
,
block_len
,
MYF
(
MY_WME
+
MY_NABP
)))
if
(
my_write
(
fd
,
(
uchar
*
)
block
,
block_len
,
MYF
(
MY_WME
+
MY_NABP
)))
{
{
rli
->
report
(
ERROR_LEVEL
,
my_errno
,
rli
->
report
(
ERROR_LEVEL
,
my_errno
,
...
...
sql/slave.cc
View file @
5618b817
...
@@ -2632,6 +2632,41 @@ log space");
...
@@ -2632,6 +2632,41 @@ log space");
DBUG_RETURN
(
0
);
// Can't return anything here
DBUG_RETURN
(
0
);
// Can't return anything here
}
}
/*
Check the temporary directory used by commands like
LOAD DATA INFILE.
*/
static
int
check_temp_dir
(
char
*
tmp_dir
,
char
*
tmp_file
)
{
int
fd
;
MY_DIR
*
dirp
;
DBUG_ENTER
(
"check_temp_dir"
);
/*
Check if the directory exists.
*/
if
(
!
(
dirp
=
my_dir
(
tmp_dir
,
MYF
(
MY_WME
))))
DBUG_RETURN
(
1
);
my_dirend
(
dirp
);
/*
Check permissions to create a file.
*/
if
((
fd
=
my_create
(
tmp_file
,
CREATE_MODE
,
O_WRONLY
|
O_BINARY
|
O_EXCL
|
O_NOFOLLOW
,
MYF
(
MY_WME
)))
<
0
)
DBUG_RETURN
(
1
);
/*
Clean up.
*/
my_close
(
fd
,
MYF
(
0
));
my_delete
(
tmp_file
,
MYF
(
0
));
DBUG_RETURN
(
0
);
}
/**
/**
Slave SQL thread entry point.
Slave SQL thread entry point.
...
@@ -2763,6 +2798,14 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME,
...
@@ -2763,6 +2798,14 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME,
llstr
(
rli
->
group_master_log_pos
,
llbuff
),
rli
->
group_relay_log_name
,
llstr
(
rli
->
group_master_log_pos
,
llbuff
),
rli
->
group_relay_log_name
,
llstr
(
rli
->
group_relay_log_pos
,
llbuff1
));
llstr
(
rli
->
group_relay_log_pos
,
llbuff1
));
if
(
check_temp_dir
(
slave_load_tmpdir
,
rli
->
slave_patternload_file
))
{
rli
->
report
(
ERROR_LEVEL
,
thd
->
main_da
.
sql_errno
(),
"Unable to use slave's temporary directory %s - %s"
,
slave_load_tmpdir
,
thd
->
main_da
.
message
());
goto
err
;
}
/* execute init_slave variable */
/* execute init_slave variable */
if
(
sys_init_slave
.
value_length
)
if
(
sys_init_slave
.
value_length
)
{
{
...
...
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