1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-merge push with patch for rpl_ndb_log

Browse Source
This commit is contained in:
Serge Kozlov 2009-02-02 15:06:40 +03:00
commit b6542a374b
10 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/federated/federated.inc
View File

@ -5,13 +5,7 @@ connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connection master; connection master;
--disable_warnings
DROP DATABASE IF EXISTS federated;
--enable_warnings
CREATE DATABASE federated; CREATE DATABASE federated;
connection slave; connection slave;
--disable_warnings
DROP DATABASE IF EXISTS federated;
--enable_warnings
CREATE DATABASE federated; CREATE DATABASE federated;

6
mysql-test/suite/federated/federated.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0; 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_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

6
mysql-test/suite/federated/federated_archive.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP TABLE IF EXISTS federated.archive_table; DROP TABLE IF EXISTS federated.archive_table;
CREATE TABLE federated.archive_table ( CREATE TABLE federated.archive_table (
@ -36,6 +34,6 @@ id name
DROP TABLE federated.t1; DROP TABLE federated.t1;
DROP TABLE federated.archive_table; DROP TABLE federated.archive_table;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

6
mysql-test/suite/federated/federated_bug_13118.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP TABLE IF EXISTS federated.bug_13118_table; DROP TABLE IF EXISTS federated.bug_13118_table;
CREATE TABLE federated.bug_13118_table ( CREATE TABLE federated.bug_13118_table (
@ -27,6 +25,6 @@ foo bar
DROP TABLE federated.t1; DROP TABLE federated.t1;
DROP TABLE federated.bug_13118_table; DROP TABLE federated.bug_13118_table;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

6
mysql-test/suite/federated/federated_bug_25714.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0; SET @@GLOBAL.CONCURRENT_INSERT= 0;
@ -50,6 +48,6 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
DROP TABLE federated.t1; DROP TABLE federated.t1;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

4
mysql-test/suite/federated/federated_bug_25714.test
View File

@ -1,11 +1,11 @@
source federated.inc;
# Check that path to the specific test program has been setup # Check that path to the specific test program has been setup
if (`select LENGTH("$MYSQL_BUG25714") = 0`) if (`select LENGTH("$MYSQL_BUG25714") = 0`)
{ {
skip Need bug25714 test program; skip Need bug25714 test program;
} }
source federated.inc;
connection master; connection master;
# Disable concurrent inserts to avoid test failures when reading # Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before # data from concurrent connections (insert might return before

4
mysql-test/suite/federated/federated_cleanup.inc
View File

@ -1,9 +1,9 @@
connection master; connection master;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
connection slave; connection slave;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
--enable_warnings --enable_warnings

6
mysql-test/suite/federated/federated_innodb.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
create table federated.t1 (a int primary key, b varchar(64)) create table federated.t1 (a int primary key, b varchar(64))
engine=myisam; engine=myisam;
@ -22,6 +20,6 @@ a b
drop table federated.t1; drop table federated.t1;
drop table federated.t1; drop table federated.t1;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

6
mysql-test/suite/federated/federated_server.result
View File

@ -1,6 +1,4 @@
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
DROP DATABASE IF EXISTS federated;
CREATE DATABASE federated; CREATE DATABASE federated;
create database first_db; create database first_db;
create database second_db; create database second_db;
@ -277,6 +275,6 @@ call p1();
drop procedure p1; drop procedure p1;
drop server if exists s; drop server if exists s;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE federated;

1
mysql-test/t/system_mysql_db_fix30020.test
View File

@ -104,4 +104,5 @@ time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
# check that we dropped all system tables # check that we dropped all system tables
show tables; show tables;
exit;
# End of 4.1 tests # End of 4.1 tests