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
40e99987
Commit
40e99987
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents
260bfaca
4ac34759
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
163 additions
and
4 deletions
+163
-4
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysql-test/r/federated.result
mysql-test/r/federated.result
+93
-2
mysql-test/t/federated.test
mysql-test/t/federated.test
+63
-2
sql/ha_federated.cc
sql/ha_federated.cc
+6
-0
No files found.
BitKeeper/etc/logging_ok
View file @
40e99987
...
@@ -205,6 +205,7 @@ patg@krsna.
...
@@ -205,6 +205,7 @@ patg@krsna.
patg@krsna.patg.net
patg@krsna.patg.net
patg@patrick-galbraiths-computer.local
patg@patrick-galbraiths-computer.local
patg@pc248.lfp.kcls.org
patg@pc248.lfp.kcls.org
patg@radha.local
paul@central.snake.net
paul@central.snake.net
paul@frost.snake.net
paul@frost.snake.net
paul@ice.local
paul@ice.local
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/federated.result
View file @
40e99987
...
@@ -906,9 +906,100 @@ INSERT INTO federated.t1 (name, country_id, other) VALUES ('Lenz', 2, 22222);
...
@@ -906,9 +906,100 @@ INSERT INTO federated.t1 (name, country_id, other) VALUES ('Lenz', 2, 22222);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Marizio', 3, 33333);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Marizio', 3, 33333);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Monty', 4, 33333);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Monty', 4, 33333);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Sanja', 5, 33333);
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Sanja', 5, 33333);
EXPLAIN SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1, federated.countries WHERE
federated.t1.country_id = federated.countries.id;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE countries ALL PRIMARY NULL NULL NULL 5
1 SIMPLE t1 ref country_id country_id 4 federated.countries.id 120
SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1, federated.countries WHERE
federated.t1.country_id = federated.countries.id;
name country_id other country
Kumar 1 11111 India
Lenz 2 22222 Germany
Marizio 3 33333 Italy
Monty 4 33333 Finland
Sanja 5 33333 Ukraine
EXPLAIN SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1 INNER JOIN federated.countries ON
federated.t1.country_id = federated.countries.id;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE countries ALL PRIMARY NULL NULL NULL 5
1 SIMPLE t1 ref country_id country_id 4 federated.countries.id 120
SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1 INNER JOIN federated.countries ON
federated.t1.country_id = federated.countries.id;
name country_id other country
Kumar 1 11111 India
Lenz 2 22222 Germany
Marizio 3 33333 Italy
Monty 4 33333 Finland
Sanja 5 33333 Ukraine
EXPLAIN SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1 INNER JOIN federated.countries ON
federated.t1.country_id = federated.countries.id
WHERE federated.t1.name = 'Monty';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE countries ALL PRIMARY NULL NULL NULL 5
1 SIMPLE t1 ref country_id country_id 4 federated.countries.id 120 Using where
SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
federated.t1.other AS other, federated.countries.country AS country
FROM federated.t1 INNER JOIN federated.countries ON
federated.t1.country_id = federated.countries.id
WHERE federated.t1.name = 'Monty';
name country_id other country
Monty 4 33333 Finland
EXPLAIN SELECT federated.t1.*, federated.countries.country
FROM federated.t1 LEFT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.countries.id;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 Using temporary; Using filesort
1 SIMPLE countries eq_ref PRIMARY PRIMARY 4 federated.t1.country_id 1
SELECT federated.t1.*, federated.countries.country
FROM federated.t1 LEFT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.countries.id;
id country_id name other country
1 1 Kumar 11111 India
2 2 Lenz 22222 Germany
3 3 Marizio 33333 Italy
4 4 Monty 33333 Finland
5 5 Sanja 33333 Ukraine
EXPLAIN SELECT federated.t1.*, federated.countries.country
FROM federated.t1 LEFT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.countries.country;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 Using temporary; Using filesort
1 SIMPLE countries eq_ref PRIMARY PRIMARY 4 federated.t1.country_id 1
SELECT federated.t1.*, federated.countries.country
FROM federated.t1 LEFT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.countries.country;
id country_id name other country
4 4 Monty 33333 Finland
2 2 Lenz 22222 Germany
1 1 Kumar 11111 India
3 3 Marizio 33333 Italy
5 5 Sanja 33333 Ukraine
EXPLAIN SELECT federated.t1.*, federated.countries.country
FROM federated.t1 RIGHT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.t1.country_id;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE countries ALL NULL NULL NULL NULL 5 Using temporary; Using filesort
1 SIMPLE t1 ref country_id country_id 4 federated.countries.id 120
SELECT federated.t1.*, federated.countries.country
SELECT federated.t1.*, federated.countries.country
FROM federated.t1 left join federated.countries
FROM federated.t1 RIGHT JOIN federated.countries
ON federated.t1.country_id = federated.countries.id;
ON federated.t1.country_id = federated.countries.id
ORDER BY federated.t1.country_id;
id country_id name other country
id country_id name other country
1 1 Kumar 11111 India
1 1 Kumar 11111 India
2 2 Lenz 22222 Germany
2 2 Lenz 22222 Germany
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/federated.test
View file @
40e99987
...
@@ -861,9 +861,70 @@ INSERT INTO federated.t1 (name, country_id, other) VALUES ('Marizio', 3, 33333);
...
@@ -861,9 +861,70 @@ INSERT INTO federated.t1 (name, country_id, other) VALUES ('Marizio', 3, 33333);
INSERT
INTO
federated
.
t1
(
name
,
country_id
,
other
)
VALUES
(
'Monty'
,
4
,
33333
);
INSERT
INTO
federated
.
t1
(
name
,
country_id
,
other
)
VALUES
(
'Monty'
,
4
,
33333
);
INSERT
INTO
federated
.
t1
(
name
,
country_id
,
other
)
VALUES
(
'Sanja'
,
5
,
33333
);
INSERT
INTO
federated
.
t1
(
name
,
country_id
,
other
)
VALUES
(
'Sanja'
,
5
,
33333
);
#inner join
EXPLAIN
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
,
federated
.
countries
WHERE
federated
.
t1
.
country_id
=
federated
.
countries
.
id
;
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
,
federated
.
countries
WHERE
federated
.
t1
.
country_id
=
federated
.
countries
.
id
;
EXPLAIN
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
INNER
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
;
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
INNER
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
;
EXPLAIN
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
INNER
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
WHERE
federated
.
t1
.
name
=
'Monty'
;
SELECT
federated
.
t1
.
name
AS
name
,
federated
.
t1
.
country_id
AS
country_id
,
federated
.
t1
.
other
AS
other
,
federated
.
countries
.
country
AS
country
FROM
federated
.
t1
INNER
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
WHERE
federated
.
t1
.
name
=
'Monty'
;
#left join
EXPLAIN
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
LEFT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
countries
.
id
;
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
LEFT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
countries
.
id
;
EXPLAIN
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
LEFT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
countries
.
country
;
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
LEFT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
countries
.
country
;
#right join
EXPLAIN
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
RIGHT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
t1
.
country_id
;
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
SELECT
federated
.
t1
.*
,
federated
.
countries
.
country
FROM
federated
.
t1
left
join
federated
.
countries
FROM
federated
.
t1
RIGHT
JOIN
federated
.
countries
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
;
ON
federated
.
t1
.
country_id
=
federated
.
countries
.
id
ORDER
BY
federated
.
t1
.
country_id
;
DROP
TABLE
federated
.
countries
;
DROP
TABLE
federated
.
countries
;
...
...
This diff is collapsed.
Click to expand it.
sql/ha_federated.cc
View file @
40e99987
...
@@ -1526,6 +1526,12 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key,
...
@@ -1526,6 +1526,12 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key,
table
->
status
=
STATUS_NOT_FOUND
;
table
->
status
=
STATUS_NOT_FOUND
;
DBUG_RETURN
(
mysql_errno
(
mysql
));
DBUG_RETURN
(
mysql_errno
(
mysql
));
}
}
/*
This basically says that the record in table->record[0] is legal, and that it is
ok to use this record, for whatever reason, such as with a join (without it, joins
will not work)
*/
table
->
status
=
0
;
DBUG_RETURN
(
rnd_next
(
buf
));
DBUG_RETURN
(
rnd_next
(
buf
));
}
}
...
...
This diff is collapsed.
Click to expand it.
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