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
b3ed9a5b
Commit
b3ed9a5b
authored
Oct 02, 2008
by
Matthias Leich
Browse files
Options
Browse Files
Download
Plain Diff
Merge 5.0 -> 5.1 of fix for
Bug#38762 main.federated_bug_25714 fails sporadically
parents
36920634
342235ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
mysql-test/r/federated_bug_25714.result
mysql-test/r/federated_bug_25714.result
+5
-2
mysql-test/t/federated_bug_25714.test
mysql-test/t/federated_bug_25714.test
+7
-5
No files found.
mysql-test/r/federated_bug_25714.result
View file @
b3ed9a5b
...
...
@@ -9,7 +9,9 @@ DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
DROP TABLE IF EXISTS federated.bug_13118_table;
CREATE TABLE federated.t1 (
...
...
@@ -51,9 +53,10 @@ id value
7 54
8 55
DROP TABLE federated.t1;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
DROP TABLE federated.t1;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
mysql-test/t/federated_bug_25714.test
View file @
b3ed9a5b
--
source
include
/
have_bug25714
.
inc
source
include
/
federated
.
inc
;
connection
default
;
connection
master
;
# Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before
# the data is actually in the table).
SET
@
OLD_CONCURRENT_INSERT
=
@@
GLOBAL
.
CONCURRENT_INSERT
;
SET
@
OLD_
MASTER_
CONCURRENT_INSERT
=
@@
GLOBAL
.
CONCURRENT_INSERT
;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
0
;
connection
slave
;
SET
@
OLD_SLAVE_CONCURRENT_INSERT
=
@@
GLOBAL
.
CONCURRENT_INSERT
;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
0
;
--
disable_warnings
DROP
TABLE
IF
EXISTS
federated
.
bug_13118_table
;
--
enable_warnings
...
...
@@ -46,11 +47,12 @@ SELECT LAST_INSERT_ID();
SELECT
*
from
federated
.
t1
;
DROP
TABLE
federated
.
t1
;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
@
OLD_MASTER_CONCURRENT_INSERT
;
connection
slave
;
DROP
TABLE
federated
.
t1
;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
@
OLD_SLAVE_CONCURRENT_INSERT
;
source
include
/
federated_cleanup
.
inc
;
connection
default
;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
@
OLD_CONCURRENT_INSERT
;
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