mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
ca5b1b5431
mysql-test/lib/My/Options.pm:
My::Options::is_set() now matches both option names and values!
mysql-test/lib/mtr_cases.pm:
1. don't merge --plugin-load here, it's too early
2. don't skip combinations that set --plugin-load just because the test needs another --plugin-load.
Skip *only* if test's --plugin-load matches *exactly* --plugin-load of one of the combinations.
3. if skipping all combinations but one, still assign the test to the combination
mysql-test/mysql-test-run.pl:
1. remove dead code - don't set variables that aren't used.
2. bugfix: allow one-letter combination names
3. in the command line, merge all --plugin-load options in one
storage/federated/ha_federated.cc:
bugfix: garbage character in the generated SELECT query
39 lines
1.1 KiB
Text
39 lines
1.1 KiB
Text
source have_federatedx.inc;
|
|
source include/have_innodb.inc;
|
|
source federated.inc;
|
|
|
|
connection slave;
|
|
DROP TABLE IF EXISTS federated.t1;
|
|
#SHOW ENGINES;
|
|
CREATE TABLE federated.t1 (
|
|
`id` int(20) NOT NULL,
|
|
`name` varchar(32) NOT NULL default ''
|
|
)
|
|
DEFAULT CHARSET=latin1 ENGINE=innodb;
|
|
|
|
connection master;
|
|
DROP TABLE IF EXISTS federated.t1;
|
|
# # correct connection, same named tables
|
|
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
|
eval CREATE TABLE federated.t1 (
|
|
`id` int(20) NOT NULL,
|
|
`name` varchar(32) NOT NULL default ''
|
|
)
|
|
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
|
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
|
|
|
set autocommit=0;
|
|
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
|
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
|
COMMIT;
|
|
INSERT INTO federated.t1 (id, name) VALUES (3, 'fie');
|
|
INSERT INTO federated.t1 (id, name) VALUES (4, 'fum');
|
|
ROLLBACK;
|
|
set autocommit=1;
|
|
INSERT INTO federated.t1 (id, name) VALUES (5, 'foe');
|
|
INSERT INTO federated.t1 (id, name) VALUES (6, 'fig');
|
|
|
|
SELECT * FROM federated.t1;
|
|
DELETE FROM federated.t1;
|
|
|
|
source federated_cleanup.inc;
|