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
b416a553
Commit
b416a553
authored
Feb 24, 2010
by
Alexander Nozdrin
Browse files
Options
Browse Files
Download
Plain Diff
Auto-merge from mysql-trunk-bugfixing.
parents
8c915300
1e638e72
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
60 additions
and
31 deletions
+60
-31
.bzr-mysql/default.conf
.bzr-mysql/default.conf
+1
-1
mysql-test/collections/default.experimental
mysql-test/collections/default.experimental
+0
-1
mysql-test/include/cleanup_fake_relay_log.inc
mysql-test/include/cleanup_fake_relay_log.inc
+4
-3
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/setup_fake_relay_log.inc
+10
-18
mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
+2
-7
mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt
...-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt
+0
-0
mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
+42
-0
sql/slave.cc
sql/slave.cc
+1
-1
No files found.
.bzr-mysql/default.conf
View file @
b416a553
[
MYSQL
]
post_commit_to
=
"commits@lists.mysql.com"
post_push_to
=
"commits@lists.mysql.com"
tree_name
=
"mysql-trunk"
tree_name
=
"mysql-trunk
-bugfixing
"
mysql-test/collections/default.experimental
View file @
b416a553
...
...
@@ -24,7 +24,6 @@ rpl.rpl_plugin_load* @solaris # Bug#47146
rpl.rpl_row_sp011* @solaris # Bug#47791 2010-01-31 alik Several test cases fail on Solaris with error Thread stack overrun
rpl.rpl_slave_load_remove_tmpfile @windows # Bug#50474 2010-01-28 alik rpl_slave_load_remove_tmpfile failed on windows debug enabled binary
rpl.rpl_sync* @windows # Bug#50473 2010-01-31 alik rpl_sync fails on windows debug enabled binaries
rpl.rpl_timezone* # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
# Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
# Usually the test cases from ndb and rpl_ndb test suites are not run in PB,
...
...
mysql-test/include/cleanup_fake_relay_log.inc
View file @
b416a553
...
...
@@ -8,9 +8,10 @@
--
echo
Cleaning
up
after
setup_fake_relay_log
.
inc
# Remove files.
remove_file
$_fake_relay_log
;
remove_file
$_fake_relay_index
;
--
disable_query_log
--
disable_warnings
STOP
SLAVE
SQL_THREAD
;
RESET
SLAVE
;
eval
SET
@@
global
.
relay_log_purge
=
$_fake_relay_log_purge
;
--
enable_warnings
--
enable_query_log
mysql-test/include/setup_fake_relay_log.inc
View file @
b416a553
...
...
@@ -66,8 +66,16 @@ let $_fake_relay_index= $MYSQLD_DATADIR/$_fake_filename.index;
# CHANGE MASTER modifies it (see the manual for CHANGE MASTER).
let
$_fake_relay_log_purge
=
`SELECT @@global.relay_log_purge`
;
# Reset slave and remove relay log and index files if they exist
RESET
SLAVE
;
error
0
,
1
;
remove_file
$MYSQLD_DATADIR
/
$_fake_filename
.
000001
;
error
0
,
1
;
remove_file
$MYSQLD_DATADIR
/
$_fake_filename
.
index
;
# Create relay log file.
copy_file
$fake_relay_log
$_fake_relay_log
;
# Create relay log index.
# After patch for BUG#12190, the filename used in CHANGE MASTER
...
...
@@ -77,28 +85,12 @@ copy_file $fake_relay_log $_fake_relay_log;
if
(
`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`
)
{
--
let
$_index_entry
=
./
$_fake_filename
-
fake
.
000001
eval
select
'./$_fake_filename-fake.000001\n'
into
dumpfile
'$_fake_relay_index'
;
}
if
(
`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`
)
{
--
let
$_index_entry
=
.
\\\\
$_fake_filename
-
fake
.
000001
}
if
(
`SELECT LENGTH(@@secure_file_priv) > 0`
)
{
--
let
$_file_priv_dir
=
`SELECT @@secure_file_priv`
;
--
let
$_suffix
=
`SELECT UUID()`
--
let
$_tmp_file
=
$_file_priv_dir
/
fake
-
index
.
$_suffix
--
eval
select
'$_index_entry\n'
into
dumpfile
'$_tmp_file'
--
copy_file
$_tmp_file
$_fake_relay_index
--
remove_file
$_tmp_file
}
if
(
`SELECT LENGTH(@@secure_file_priv) = 0`
)
{
--
eval
select
'$_index_entry\n'
into
dumpfile
'$_fake_relay_index'
eval
select
'.\\\\$_fake_filename-fake.000001\n'
into
dumpfile
'$_fake_relay_index'
;
}
# Setup replication from existing relay log.
...
...
mysql-test/suite/
binlog/r/binlog_auto_increment
_bug33029.result
→
mysql-test/suite/
rpl/r/rpl_binlog_auto_inc
_bug33029.result
View file @
b416a553
SET @old_relay_log_purge= @@global.relay_log_purge;
change master to
MASTER_HOST='dummy.localdomain',
RELAY_LOG_FILE='slave-relay-bin.000001',
RELAY_LOG_POS=4;
Setting up fake replication from MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
start slave sql_thread;
select MASTER_POS_WAIT('master-bin.000001', 3776);
# Result on slave
...
...
@@ -38,5 +34,4 @@ DROP PROCEDURE IF EXISTS p2;
DROP FUNCTION IF EXISTS f1;
DROP TRIGGER IF EXISTS tr1;
stop slave sql_thread;
reset slave;
SET @@global.relay_log_purge= @old_relay_log_purge;
Cleaning up after setup_fake_relay_log.inc
mysql-test/suite/
binlog/t/binlog_auto_increment
_bug33029-master.opt
→
mysql-test/suite/
rpl/t/rpl_binlog_auto_inc
_bug33029-master.opt
View file @
b416a553
File moved
mysql-test/suite/
binlog/t/binlog_auto_increment
_bug33029.test
→
mysql-test/suite/
rpl/t/rpl_binlog_auto_inc
_bug33029.test
View file @
b416a553
...
...
@@ -17,35 +17,8 @@
source
include
/
have_log_bin
.
inc
;
# Need to restore this at the end; CHANGE MASTER modifies it (see the
# manual for CHANGE MASTER).
SET
@
old_relay_log_purge
=
@@
global
.
relay_log_purge
;
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
copy_file
$MYSQL_TEST_DIR
/
std_data
/
bug33029
-
slave
-
relay
-
bin
.
000001
$MYSQLD_DATADIR
/
slave
-
relay
-
bin
.
000001
;
# After patch for BUG#12190, the filename used in CHANGE MASTER
# RELAY_LOG_FILE will be automatically added the directory of the
# relay log before comparison, thus we need to added the directory
# part (./ on unix .\ on windows) when faking the relay-log-bin.index.
disable_query_log
;
if
(
`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`
)
{
eval
select
'./slave-relay-bin.000001\n'
into
dumpfile
'$MYSQLD_DATADIR/slave-relay-bin.index'
;
}
if
(
`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`
)
{
eval
select
'.\\\\slave-relay-bin.000001\n'
into
dumpfile
'$MYSQLD_DATADIR/slave-relay-bin.index'
;
}
enable_query_log
;
change
master
to
MASTER_HOST
=
'dummy.localdomain'
,
RELAY_LOG_FILE
=
'slave-relay-bin.000001'
,
RELAY_LOG_POS
=
4
;
let
$fake_relay_log
=
$MYSQL_TEST_DIR
/
std_data
/
bug33029
-
slave
-
relay
-
bin
.
000001
;
source
include
/
setup_fake_relay_log
.
inc
;
start
slave
sql_thread
;
disable_result_log
;
...
...
@@ -66,9 +39,4 @@ DROP TRIGGER IF EXISTS tr1;
enable_warnings
;
stop
slave
sql_thread
;
reset
slave
;
source
include
/
wait_for_slave_sql_to_stop
.
inc
;
remove_file
$MYSQLD_DATADIR
/
slave
-
relay
-
bin
.
000001
;
remove_file
$MYSQLD_DATADIR
/
slave
-
relay
-
bin
.
index
;
SET
@@
global
.
relay_log_purge
=
@
old_relay_log_purge
;
source
include
/
cleanup_fake_relay_log
.
inc
;
sql/slave.cc
View file @
b416a553
...
...
@@ -1726,7 +1726,7 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi)
" to the relay log, SHOW SLAVE STATUS may be"
" inaccurate"
);
rli
->
relay_log
.
harvest_bytes_written
(
&
rli
->
log_space_total
);
if
(
flush_master_info
(
mi
,
TRUE
,
FALS
E
))
if
(
flush_master_info
(
mi
,
TRUE
,
TRU
E
))
sql_print_error
(
"Failed to flush master info file"
);
delete
ev
;
}
...
...
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