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
7ee8ac6d
Commit
7ee8ac6d
authored
Feb 02, 2009
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed system_mysql_db_fix30020 test faiilure
fixed federated warnings
parent
f21af106
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
34 deletions
+17
-34
mysql-test/suite/federated/federated.inc
mysql-test/suite/federated/federated.inc
+0
-6
mysql-test/suite/federated/federated.result
mysql-test/suite/federated/federated.result
+2
-4
mysql-test/suite/federated/federated_archive.result
mysql-test/suite/federated/federated_archive.result
+2
-4
mysql-test/suite/federated/federated_bug_13118.result
mysql-test/suite/federated/federated_bug_13118.result
+2
-4
mysql-test/suite/federated/federated_bug_25714.result
mysql-test/suite/federated/federated_bug_25714.result
+2
-4
mysql-test/suite/federated/federated_bug_25714.test
mysql-test/suite/federated/federated_bug_25714.test
+2
-2
mysql-test/suite/federated/federated_cleanup.inc
mysql-test/suite/federated/federated_cleanup.inc
+2
-2
mysql-test/suite/federated/federated_innodb.result
mysql-test/suite/federated/federated_innodb.result
+2
-4
mysql-test/suite/federated/federated_server.result
mysql-test/suite/federated/federated_server.result
+2
-4
mysql-test/t/system_mysql_db_fix30020.test
mysql-test/t/system_mysql_db_fix30020.test
+1
-0
No files found.
mysql-test/suite/federated/federated.inc
View file @
7ee8ac6d
...
...
@@ -5,13 +5,7 @@ connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect
(
slave
,
127.0
.
0.1
,
root
,,
test
,
$SLAVE_MYPORT
,);
connection
master
;
--
disable_warnings
DROP
DATABASE
IF
EXISTS
federated
;
--
enable_warnings
CREATE
DATABASE
federated
;
connection
slave
;
--
disable_warnings
DROP
DATABASE
IF
EXISTS
federated
;
--
enable_warnings
CREATE
DATABASE
federated
;
mysql-test/suite/federated/federated.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
...
...
@@ -2139,6 +2137,6 @@ End of 5.1 tests
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/suite/federated/federated_archive.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP TABLE IF EXISTS federated.archive_table;
CREATE TABLE federated.archive_table (
...
...
@@ -36,6 +34,6 @@ id name
DROP TABLE federated.t1;
DROP TABLE federated.archive_table;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/suite/federated/federated_bug_13118.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP TABLE IF EXISTS federated.bug_13118_table;
CREATE TABLE federated.bug_13118_table (
...
...
@@ -27,6 +25,6 @@ foo bar
DROP TABLE federated.t1;
DROP TABLE federated.bug_13118_table;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/suite/federated/federated_bug_25714.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
...
...
@@ -50,6 +48,6 @@ 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 DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/suite/federated/federated_bug_25714.test
View file @
7ee8ac6d
source
federated
.
inc
;
# Check that path to the specific test program has been setup
if
(
`select LENGTH("$MYSQL_BUG25714") = 0`
)
{
skip
Need
bug25714
test
program
;
}
source
federated
.
inc
;
connection
master
;
# Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before
...
...
mysql-test/suite/federated/federated_cleanup.inc
View file @
7ee8ac6d
connection
master
;
--
disable_warnings
DROP
TABLE
IF
EXISTS
federated
.
t1
;
DROP
DATABASE
IF
EXISTS
federated
;
DROP
DATABASE
federated
;
connection
slave
;
DROP
TABLE
IF
EXISTS
federated
.
t1
;
DROP
DATABASE
IF
EXISTS
federated
;
DROP
DATABASE
federated
;
--
enable_warnings
mysql-test/suite/federated/federated_innodb.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
create table federated.t1 (a int primary key, b varchar(64))
engine=myisam;
...
...
@@ -22,6 +20,6 @@ a b
drop table federated.t1;
drop table federated.t1;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/suite/federated/federated_server.result
View file @
7ee8ac6d
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated;
create database first_db;
create database second_db;
...
...
@@ -277,6 +275,6 @@ call p1();
drop procedure p1;
drop server if exists s;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE
IF EXISTS
federated;
DROP DATABASE federated;
mysql-test/t/system_mysql_db_fix30020.test
View file @
7ee8ac6d
...
...
@@ -104,4 +104,5 @@ time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
# check that we dropped all system tables
show
tables
;
exit
;
# End of 4.1 tests
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