mirror of
https://github.com/MariaDB/server.git
synced 2026-05-03 13:45:34 +02:00
5.3.4 merge
This commit is contained in:
Sergei Golubchik
commit
25609313ff
117 changed files with 4695 additions and 2204 deletions
|
|
@ -29,6 +29,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
|
||||
|
|
@ -46,6 +47,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -80,6 +82,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
|
||||
|
|
@ -97,6 +100,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -128,6 +132,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -145,6 +150,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
## should be 5 (previous LIMIT)
|
||||
SELECT 1 - COUNT(*) FROM t2 WHERE b = 10;
|
||||
|
|
@ -180,6 +186,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -197,6 +204,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
## should be 5 (previous LIMIT)
|
||||
SELECT 257 - COUNT(*) FROM t2 WHERE b = 10;
|
||||
|
|
@ -226,6 +234,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -243,6 +252,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE b = 10 ORDER BY a, c;
|
||||
a b c d
|
||||
|
|
@ -270,6 +280,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -287,6 +298,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE b = 10 ORDER BY a, c;
|
||||
a b c d
|
||||
|
|
@ -317,6 +329,7 @@ Handler_read_last 0
|
|||
Handler_read_next 7
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 4
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
EXPLAIN EXTENDED SELECT * FROM t2 WHERE key1 < 13 or key2 < 14 ORDER BY key1;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
|
|
@ -339,6 +352,7 @@ Handler_read_last 0
|
|||
Handler_read_next 7
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 8
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE key1 < 13 or key2 < 14 ORDER BY key1;
|
||||
i key1 key2
|
||||
|
|
@ -375,6 +389,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i DESC LIMIT 5;
|
||||
|
|
@ -392,6 +407,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -426,6 +442,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 ORDER BY a, b DESC LIMIT 5;
|
||||
|
|
@ -443,6 +460,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 ORDER BY a, b DESC;
|
||||
a b c
|
||||
|
|
@ -486,6 +504,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
SELECT * FROM t2 ORDER BY a DESC, b DESC LIMIT 5;
|
||||
|
|
@ -509,6 +528,7 @@ Handler_read_last 1
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
DELETE FROM t2 ORDER BY a DESC, b DESC LIMIT 5;
|
||||
|
|
@ -526,6 +546,7 @@ Handler_read_last 1
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE c = 10 ORDER BY a DESC, b DESC;
|
||||
a b c
|
||||
|
|
@ -561,6 +582,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
|
||||
|
|
@ -578,6 +600,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -617,6 +640,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
|
||||
|
|
@ -634,6 +658,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -670,6 +695,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -687,6 +713,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
## should be 5 (previous LIMIT)
|
||||
SELECT COUNT(*) FROM t2 WHERE b = 10 AND d = 10 ORDER BY a, c;
|
||||
|
|
@ -722,6 +749,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -739,6 +767,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
## should be 5 (previous LIMIT)
|
||||
SELECT COUNT(*) FROM t2 WHERE b = 10 AND d = 10 ORDER BY a, c;
|
||||
|
|
@ -768,6 +797,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -785,6 +815,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE b = 10 ORDER BY a, c;
|
||||
a b c d
|
||||
|
|
@ -813,6 +844,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;
|
||||
|
|
@ -830,6 +862,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 1
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE b = 10 ORDER BY a, c;
|
||||
a b c d
|
||||
|
|
@ -861,6 +894,7 @@ Handler_read_last 0
|
|||
Handler_read_next 7
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 4
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
EXPLAIN EXTENDED SELECT * FROM t2 WHERE key1 < 13 or key2 < 14 ORDER BY key1;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
|
|
@ -883,6 +917,7 @@ Handler_read_last 0
|
|||
Handler_read_next 7
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 8
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE key1 < 13 or key2 < 14 ORDER BY key1;
|
||||
i key1 key2
|
||||
|
|
@ -923,6 +958,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i DESC LIMIT 5;
|
||||
|
|
@ -940,6 +976,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE i > 10 AND i <= 18 ORDER BY i;
|
||||
a i
|
||||
|
|
@ -979,6 +1016,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET c = 10 ORDER BY a, b DESC LIMIT 5;
|
||||
|
|
@ -996,6 +1034,7 @@ Handler_read_last 0
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 17
|
||||
SELECT * FROM t2 WHERE c = 10 ORDER BY a, b DESC;
|
||||
a b c
|
||||
|
|
@ -1033,6 +1072,7 @@ Handler_read_last 0
|
|||
Handler_read_next 4
|
||||
Handler_read_prev 0
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
SELECT * FROM t2 ORDER BY a DESC, b DESC LIMIT 5;
|
||||
|
|
@ -1056,6 +1096,7 @@ Handler_read_last 1
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 0
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
FLUSH STATUS;
|
||||
UPDATE t2 SET c = 10 ORDER BY a DESC, b DESC LIMIT 5;
|
||||
|
|
@ -1073,6 +1114,7 @@ Handler_read_last 1
|
|||
Handler_read_next 0
|
||||
Handler_read_prev 4
|
||||
Handler_read_rnd 5
|
||||
Handler_read_rnd_deleted 0
|
||||
Handler_read_rnd_next 0
|
||||
SELECT * FROM t2 WHERE c = 10 ORDER BY a DESC, b DESC;
|
||||
a b c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue