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
436ccb69
Commit
436ccb69
authored
Sep 30, 2009
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Plain Diff
Manual merge.
parents
b29966b0
e218ac06
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
98 additions
and
2 deletions
+98
-2
mysql-test/suite/federated/federated_debug-master.opt
mysql-test/suite/federated/federated_debug-master.opt
+1
-0
mysql-test/suite/federated/federated_debug.result
mysql-test/suite/federated/federated_debug.result
+28
-0
mysql-test/suite/federated/federated_debug.test
mysql-test/suite/federated/federated_debug.test
+39
-0
mysql-test/suite/federated/my.cnf
mysql-test/suite/federated/my.cnf
+3
-0
sql/slave.cc
sql/slave.cc
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+26
-1
No files found.
mysql-test/suite/federated/federated_debug-master.opt
0 → 100644
View file @
436ccb69
--loose-debug=d,simulate_detached_thread_refresh
mysql-test/suite/federated/federated_debug.result
0 → 100644
View file @
436ccb69
CREATE DATABASE federated;
CREATE DATABASE federated;
#
# Bug#47525: MySQL crashed (Federated)
#
# Switch to slave
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES (1);
# Switch to master
CREATE TABLE t1(a INT) ENGINE=FEDERATED
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';
SELECT * FROM t1;
a
1
# Start a asynchronous reload
# Wait for tables to be closed
# Ensure that the server didn't crash
SELECT * FROM t1;
a
1
# Drop tables on master and slave
DROP TABLE t1;
DROP TABLE t1;
# Federated cleanup
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE federated;
mysql-test/suite/federated/federated_debug.test
0 → 100644
View file @
436ccb69
--
source
include
/
have_debug
.
inc
--
source
federated
.
inc
--
echo
#
--
echo
# Bug#47525: MySQL crashed (Federated)
--
echo
#
connection
slave
;
--
echo
# Switch to slave
CREATE
TABLE
t1
(
a
INT
);
INSERT
INTO
t1
VALUES
(
1
);
connection
master
;
--
echo
# Switch to master
--
replace_result
$SLAVE_MYPORT
SLAVE_PORT
eval
CREATE
TABLE
t1
(
a
INT
)
ENGINE
=
FEDERATED
CONNECTION
=
'mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t1'
;
SELECT
*
FROM
t1
;
--
echo
# Start a asynchronous reload
--
exec
$MYSQLADMIN
--
no
-
defaults
-
S
$MASTER_MYSOCK
-
P
$MASTER_MYPORT
-
u
root
--
password
=
refresh
2
>&
1
--
echo
# Wait for tables to be closed
let
$show_statement
=
SHOW
STATUS
LIKE
'Open_tables'
;
let
$field
=
Value
;
let
$condition
=
=
'0'
;
--
source
include
/
wait_show_condition
.
inc
--
echo
# Ensure that the server didn't crash
SELECT
*
FROM
t1
;
--
echo
# Drop tables on master and slave
DROP
TABLE
t1
;
connection
slave
;
DROP
TABLE
t1
;
connection
default
;
--
echo
# Federated cleanup
source
federated_cleanup
.
inc
;
mysql-test/suite/federated/my.cnf
View file @
436ccb69
...
...
@@ -9,4 +9,7 @@ log-bin= master-bin
[ENV]
MASTER_MYPORT= @mysqld.1.port
MASTER_MYSOCK= @mysqld.1.socket
SLAVE_MYPORT= @mysqld.2.port
SLAVE_MYSOCK= @mysqld.2.socket
sql/slave.cc
View file @
436ccb69
...
...
@@ -3761,7 +3761,7 @@ extern "C" void slave_io_thread_detach_vio()
{
#ifdef SIGNAL_WITH_VIO_CLOSE
THD
*
thd
=
current_thd
;
if
(
thd
->
slave_thread
)
if
(
thd
&&
thd
->
slave_thread
)
thd
->
clear_active_vio
();
#endif
}
...
...
sql/sql_parse.cc
View file @
436ccb69
...
...
@@ -1428,7 +1428,27 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if
(
check_global_access
(
thd
,
RELOAD_ACL
))
break
;
general_log_print
(
thd
,
command
,
NullS
);
if
(
!
reload_acl_and_cache
(
thd
,
options
,
(
TABLE_LIST
*
)
0
,
&
not_used
))
#ifndef DBUG_OFF
DBUG_EXECUTE_IF
(
"simulate_detached_thread_refresh"
,
{
/*
Simulate a reload without a attached thread session.
Provides a environment similar to that of when the
server receives a SIGHUP signal and reloads caches
and flushes tables.
*/
bool
res
;
my_pthread_setspecific_ptr
(
THR_THD
,
NULL
);
res
=
reload_acl_and_cache
(
NULL
,
options
|
REFRESH_FAST
,
NULL
,
&
not_used
);
my_pthread_setspecific_ptr
(
THR_THD
,
thd
);
if
(
!
res
)
my_ok
(
thd
);
goto
end
;
}
);
#endif
if
(
!
reload_acl_and_cache
(
thd
,
options
,
NULL
,
&
not_used
))
my_ok
(
thd
);
break
;
}
...
...
@@ -1571,6 +1591,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break
;
}
/* Break the switch for DBUG wrapped code. */
#ifndef DBUG_OFF
end:
#endif
/* report error issued during command execution */
if
(
thd
->
killed_errno
())
{
...
...
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