database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Manual merge of csets from -build tree into main 5.0 tree.

Browse Source
This commit is contained in:
dlenev@mysql.com
2005-03-21 11:39:47 +03:00
parent df12e29955 701a7c4875
commit ea8adbff36
40 changed files with 94 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/federated.result
View File

@@ -106,7 +106,7 @@ CREATE TABLE federated.`t1%` (
`name` varchar(32) NOT NULL default ''
)
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
COMMENT='mysql://root@127.0.0.1:9308/federated/t1%';
COMMENT='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
SELECT * FROM federated.`t1%`;

6
mysql-test/r/kill.result
View File

@@ -5,6 +5,12 @@ select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0
kill @id;
select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0
select @id != connection_id();
@id != connection_id()
1
select 4;
4
4

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

@@ -125,6 +125,7 @@ SELECT * FROM federated.t1;
DELETE FROM federated.t1;
DROP TABLE IF EXISTS federated.t1;
--replace_result $SLAVE_MYPORT SLAVE_PORT
eval CREATE TABLE federated.`t1%` (
`id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default ''

5
mysql-test/t/kill.test
View File

@@ -27,8 +27,9 @@ kill @id;
--sleep 5
# verify that con1 is doning a reconnect
connection con1;
ping
ping
--ping
--ping
select ((@id := kill_id) - kill_id) from t1;
select @id != connection_id();
#make sure the server is still alive