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
b6c58769
Commit
b6c58769
authored
Jun 26, 2006
by
knielsen@rt.int.sifira.dk
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine
into mysql.com:/usr/local/mysql/tmp-5.1
parents
22285bb7
3ba774f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
14 deletions
+33
-14
mysql-test/r/events_stress.result
mysql-test/r/events_stress.result
+6
-2
mysql-test/r/ndb_binlog_multi.result
mysql-test/r/ndb_binlog_multi.result
+4
-2
mysql-test/t/events_stress.test
mysql-test/t/events_stress.test
+14
-8
mysql-test/t/ndb_binlog_multi.test
mysql-test/t/ndb_binlog_multi.test
+9
-2
No files found.
mysql-test/r/events_stress.result
View file @
b6c58769
CREATE DATABASE IF NOT EXISTS events_test;
CREATE DATABASE events_conn1_test2;
CREATE TABLE events_test.fill_it(test_name varchar(20), occur datetime);
CREATE TABLE events_test.fill_it1(test_name varchar(20), occur datetime);
CREATE TABLE events_test.fill_it2(test_name varchar(20), occur datetime);
CREATE TABLE events_test.fill_it3(test_name varchar(20), occur datetime);
CREATE USER event_user2@localhost;
CREATE DATABASE events_conn2_db;
GRANT ALL ON *.* TO event_user2@localhost;
...
...
@@ -57,5 +59,7 @@ SET GLOBAL event_scheduler=2;
DROP DATABASE events_conn1_test4;
SET GLOBAL event_scheduler=1;
USE events_test;
DROP TABLE fill_it;
DROP TABLE fill_it1;
DROP TABLE fill_it2;
DROP TABLE fill_it3;
DROP DATABASE events_test;
mysql-test/r/ndb_binlog_multi.result
View file @
b6c58769
drop table if exists t1,t2;
drop table if exists t1,t2;
drop table if exists t1,t2,t3;
drop table if exists t1,t2,t3;
CREATE TABLE t3 (dummy INT PRIMARY KEY) ENGINE = NDB;
DROP TABLE t3;
reset master;
reset master;
CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB;
...
...
mysql-test/t/events_stress.test
View file @
b6c58769
...
...
@@ -3,7 +3,11 @@ CREATE DATABASE IF NOT EXISTS events_test;
# DROP DATABASE test start (bug #16406)
#
CREATE
DATABASE
events_conn1_test2
;
CREATE
TABLE
events_test
.
fill_it
(
test_name
varchar
(
20
),
occur
datetime
);
# BUG#20676: MySQL in debug mode has a limit of 100 waiters
# (in mysys/thr_lock.c), so use three different tables to insert into.
CREATE
TABLE
events_test
.
fill_it1
(
test_name
varchar
(
20
),
occur
datetime
);
CREATE
TABLE
events_test
.
fill_it2
(
test_name
varchar
(
20
),
occur
datetime
);
CREATE
TABLE
events_test
.
fill_it3
(
test_name
varchar
(
20
),
occur
datetime
);
CREATE
USER
event_user2
@
localhost
;
CREATE
DATABASE
events_conn2_db
;
GRANT
ALL
ON
*.*
TO
event_user2
@
localhost
;
...
...
@@ -16,7 +20,7 @@ connect (conn2,localhost,event_user2,,events_conn2_db);
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
conn2_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn2_ev$1"
,
NOW
());
eval
CREATE
EVENT
conn2_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
1
VALUES
(
"conn2_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -26,7 +30,7 @@ connect (conn3,localhost,event_user3,,events_conn3_db);
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
conn3_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn3_ev$1"
,
NOW
());
eval
CREATE
EVENT
conn3_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
1
VALUES
(
"conn3_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -48,7 +52,7 @@ USE events_conn1_test2;
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
conn1_round1_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn1_round1_ev$1"
,
NOW
());
eval
CREATE
EVENT
conn1_round1_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
2
VALUES
(
"conn1_round1_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -65,7 +69,7 @@ USE events_conn1_test3;
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
conn1_round2_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn1_round2_ev$1"
,
NOW
());
eval
CREATE
EVENT
conn1_round2_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
2
VALUES
(
"conn1_round2_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -77,7 +81,7 @@ USE events_conn1_test4;
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
conn1_round3_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn1_round3_ev$1"
,
NOW
());
eval
CREATE
EVENT
conn1_round3_ev
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
3
VALUES
(
"conn1_round3_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -88,7 +92,7 @@ USE events_conn1_test2;
let
$
1
=
50
;
while
(
$
1
)
{
eval
CREATE
EVENT
ev_round4_drop
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
VALUES
(
"conn1_round4_ev$1"
,
NOW
());
eval
CREATE
EVENT
ev_round4_drop
$
1
ON
SCHEDULE
EVERY
1
SECOND
DO
INSERT
INTO
events_test
.
fill_it
3
VALUES
(
"conn1_round4_ev$1"
,
NOW
());
dec
$
1
;
}
--
enable_query_log
...
...
@@ -115,7 +119,9 @@ reap;
disconnect
conn3
;
connection
default
;
USE
events_test
;
DROP
TABLE
fill_it
;
DROP
TABLE
fill_it1
;
DROP
TABLE
fill_it2
;
DROP
TABLE
fill_it3
;
--
disable_query_log
DROP
USER
event_user2
@
localhost
;
DROP
USER
event_user3
@
localhost
;
...
...
mysql-test/t/ndb_binlog_multi.test
View file @
b6c58769
...
...
@@ -4,11 +4,18 @@
--
disable_warnings
connection
server2
;
drop
table
if
exists
t1
,
t2
;
drop
table
if
exists
t1
,
t2
,
t3
;
connection
server1
;
drop
table
if
exists
t1
,
t2
;
drop
table
if
exists
t1
,
t2
,
t3
;
--
enable_warnings
# Dummy table create/drop to avoid a race where table is created
# before event subscription is set up, causing test failure (BUG#20677).
connection
server2
;
CREATE
TABLE
t3
(
dummy
INT
PRIMARY
KEY
)
ENGINE
=
NDB
;
connection
server1
;
DROP
TABLE
t3
;
# reset for test
connection
server1
;
reset
master
;
...
...
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