#At lp:maria
2770 [email protected] 2009-11-24
After-merge fixes for MySQL 5.1.41 merge: PBXT result file updates.
modified:
mysql-test/suite/pbxt/r/func_group.result
mysql-test/suite/pbxt/r/grant.result
mysql-test/suite/pbxt/r/group_min_max.result
mysql-test/suite/pbxt/r/join_nested.result
mysql-test/suite/pbxt/r/negation_elimination.result
mysql-test/suite/pbxt/r/ps_grant.result
mysql-test/suite/pbxt/r/skip_grants.result
mysql-test/suite/pbxt/r/subselect.result
mysql-test/suite/pbxt/r/view_grant.result
mysql-test/suite/pbxt/t/grant.test
mysql-test/suite/pbxt/t/ps_grant.test
mysql-test/suite/pbxt/t/subselect.test
per-file messages:
mysql-test/suite/pbxt/r/func_group.result
Result file update.
mysql-test/suite/pbxt/r/grant.result
Use --sorted_result
mysql-test/suite/pbxt/r/group_min_max.result
Result file update.
mysql-test/suite/pbxt/r/join_nested.result
Result file update.
mysql-test/suite/pbxt/r/negation_elimination.result
Result file update.
mysql-test/suite/pbxt/r/ps_grant.result
Use --sorted_result
mysql-test/suite/pbxt/r/skip_grants.result
Result file update.
mysql-test/suite/pbxt/r/subselect.result
Adjust test case following error message change due to fix of Bug#48293
mysql-test/suite/pbxt/r/view_grant.result
Result file update.
mysql-test/suite/pbxt/t/grant.test
Use --sorted_result
mysql-test/suite/pbxt/t/ps_grant.test
Use --sorted_result
mysql-test/suite/pbxt/t/subselect.test
Adjust test case following error message change due to fix of Bug#48293
=== modified file 'mysql-test/suite/pbxt/r/func_group.result'
--- a/mysql-test/suite/pbxt/r/func_group.result 2009-08-17 15:57:58 +0000
+++ b/mysql-test/suite/pbxt/r/func_group.result 2009-11-24 10:19:08 +0000
@@ -601,7 +601,7 @@ AME AME
explain
select min(a1) from t1 where a1 > 'KKK' or a1 < 'XXX';
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t1 range PRIMARY PRIMARY 0 NULL 1 Using
where; Using index
+1 SIMPLE t1 index PRIMARY PRIMARY 3 NULL 15 Using
where; Using index
explain
select min(a1) from t1 where a1 != 'KKK';
id select_type table type possible_keys key key_len ref
rows Extra
=== modified file 'mysql-test/suite/pbxt/r/grant.result'
--- a/mysql-test/suite/pbxt/r/grant.result 2009-08-17 15:57:58 +0000
+++ b/mysql-test/suite/pbxt/r/grant.result 2009-11-24 10:19:08 +0000
@@ -993,9 +993,9 @@ GRANT INSERT, SELECT, CREATE, ALTER, DRO
DROP TABLE mysqltest1.t2;
SHOW GRANTS;
Grants for mysqltes...@localhost
-GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
-GRANT SELECT, INSERT, CREATE, DROP, ALTER ON `mysqltest1`.`t2` TO
'mysqltest_1'@'localhost'
GRANT SELECT, INSERT, CREATE, DROP, ALTER ON `mysqltest1`.`t1` TO
'mysqltest_1'@'localhost'
+GRANT SELECT, INSERT, CREATE, DROP, ALTER ON `mysqltest1`.`t2` TO
'mysqltest_1'@'localhost'
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
RENAME TABLE t1 TO t2;
RENAME TABLE t2 TO t1;
ALTER TABLE t1 RENAME TO t2;
@@ -1004,9 +1004,9 @@ REVOKE DROP, INSERT ON mysqltest1.t1 FRO
REVOKE DROP, INSERT ON mysqltest1.t2 FROM mysqltes...@localhost;
SHOW GRANTS;
Grants for mysqltes...@localhost
-GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
-GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t2` TO 'mysqltest_1'@'localhost'
GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t1` TO 'mysqltest_1'@'localhost'
+GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t2` TO 'mysqltest_1'@'localhost'
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
RENAME TABLE t1 TO t2;
ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table
't1'
ALTER TABLE t1 RENAME TO t2;
=== modified file 'mysql-test/suite/pbxt/r/group_min_max.result'
--- a/mysql-test/suite/pbxt/r/group_min_max.result 2009-08-17 15:57:58
+0000
+++ b/mysql-test/suite/pbxt/r/group_min_max.result 2009-11-24 10:19:08
+0000
@@ -876,10 +876,10 @@ id select_type table type possible_keys
1 SIMPLE t1 range NULL idx_t1_1 163 NULL 129
Using where; Using index for group-by
explain select a1,a2,b, max(c) from t1 where (c > 'b1') or (c <= 'g1')
group by a1,a2,b;
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t1 range NULL idx_t1_1 147 NULL 129
Using where; Using index for group-by
+1 SIMPLE t1 range NULL idx_t1_1 163 NULL 129
Using where; Using index for group-by
explain select a1,a2,b,min(c),max(c) from t1 where (c > 'b1') or (c <= 'g1')
group by a1,a2,b;
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t1 range NULL idx_t1_1 147 NULL 129
Using where; Using index for group-by
+1 SIMPLE t1 range NULL idx_t1_1 163 NULL 129
Using where; Using index for group-by
explain select a1,a2,b,min(c),max(c) from t1 where (c > 'b111') and (c <=
'g112') group by a1,a2,b;
id select_type table type possible_keys key key_len ref
rows Extra
1 SIMPLE t1 range NULL idx_t1_1 163 NULL 129
Using where; Using index for group-by
@@ -924,7 +924,7 @@ id select_type table type possible_keys
1 SIMPLE t2 range NULL idx_t2_1 163 NULL #
Using where; Using index for group-by
explain select a1,a2,b, max(c) from t2 where (c > 'b1') or (c <= 'g1')
group by a1,a2,b;
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t2 range NULL idx_t2_1 146 NULL #
Using where; Using index for group-by
+1 SIMPLE t2 range NULL idx_t2_1 163 NULL #
Using where; Using index for group-by
explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b1') or (c <= 'g1')
group by a1,a2,b;
id select_type table type possible_keys key key_len ref
rows Extra
1 SIMPLE t2 range NULL idx_t2_1 163 NULL #
Using where; Using index for group-by
=== modified file 'mysql-test/suite/pbxt/r/join_nested.result'
--- a/mysql-test/suite/pbxt/r/join_nested.result 2009-08-17 15:57:58
+0000
+++ b/mysql-test/suite/pbxt/r/join_nested.result 2009-11-24 10:19:08
+0000
@@ -958,15 +958,15 @@ id select_type table type possible_keys
1 SIMPLE t0 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00
Using where; Using join buffer
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 100.00
Using where
-1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00
1 SIMPLE t3 ALL NULL NULL NULL NULL 2 100.00
Using where
+1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00 Using where
1 SIMPLE t5 ALL idx_b NULL NULL NULL 3 100.00
Using where
1 SIMPLE t7 ALL NULL NULL NULL NULL 2 100.00
Using where
1 SIMPLE t6 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t8 ALL NULL NULL NULL NULL 2 100.00
Using where
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 100.00
Using where; Using join buffer
Warnings:
-Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t3`.`b` = `test`.`t4`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
+Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
CREATE INDEX idx_b ON t8(b);
EXPLAIN EXTENDED
SELECT t0.a,t0.b,t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,
@@ -1008,13 +1008,13 @@ id select_type table type possible_keys
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00
Using where; Using join buffer
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t3 ALL NULL NULL NULL NULL 2 100.00
Using where
-1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00
+1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00 Using where
1 SIMPLE t5 ALL idx_b NULL NULL NULL 3 100.00
Using where
1 SIMPLE t6 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t7 ALL NULL NULL NULL NULL 2 100.00
Using where
1 SIMPLE t8 ref idx_b idx_b 5 test.t5.b 1
100.00 Using where
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 100.00
Using where; Using join buffer
-Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t3`.`b` = `test`.`t4`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
+Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
Warnings:
CREATE INDEX idx_b ON t1(b);
CREATE INDEX idx_a ON t0(a);
@@ -1058,13 +1058,13 @@ id select_type table type possible_keys
1 SIMPLE t1 ref idx_b idx_b 5 test.t0.b 1
100.00 Using where
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t3 ALL NULL NULL NULL NULL 2 100.00
Using where
-1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00
+1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1
100.00 Using where
1 SIMPLE t5 ALL idx_b NULL NULL NULL 3 100.00
Using where
1 SIMPLE t6 ALL NULL NULL NULL NULL 3 100.00
Using where
1 SIMPLE t7 ALL NULL NULL NULL NULL 2 100.00
Using where
1 SIMPLE t8 ref idx_b idx_b 5 test.t5.b 1
100.00 Using where
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 100.00
Using where; Using join buffer
-Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t3`.`b` = `test`.`t4`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
+Note 1003 select `test`.`t0`.`a` AS `a`,`test`.`t0`.`b` AS
`b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS
`a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS
`b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t5`.`a` AS
`a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS
`b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS
`a`,`test`.`t8`.`b` AS `b`,`test`.`t9`.`a` AS `a`,`test`.`t9`.`b` AS `b` from
`test`.`t0` join `test`.`t1` left join (`test`.`t2` left join (`test`.`t3` join
`test`.`t4`) on(((`test`.`t4`.`b` = `test`.`t2`.`b`) and (`test`.`t3`.`a` =
1))) join `test`.`t5` left join (`test`.`t6` join `test`.`t7` left join
`test`.`t8` on(((`test`.`t8`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` <
10)))) on(((`test`.`t7`.`b` = `test`.`t5`.`b`) and (`test`.`t6`.`b` >= 2))))
on((((`test`.`t3`.`b` = 2) or isnull(`test`.`t3`.`c`)) and ((`test`.`t6`.`b` =
2) or isnull(`test`.`t6`.`c`)) and ((`test`.`t5`.`b` = `test`.`t0`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t6`.`c`) or isnull(`test`.`t8`.`c`))
and (`test`.`t1`.`a` <> 2))) join `test`.`t9` where ((`test`.`t9`.`a` = 1) and
(`test`.`t1`.`b` = `test`.`t0`.`b`) and (`test`.`t0`.`a` = 1) and
((`test`.`t2`.`a` >= 4) or isnull(`test`.`t2`.`c`)) and ((`test`.`t3`.`a` < 5)
or isnull(`test`.`t3`.`c`)) and ((`test`.`t4`.`b` = `test`.`t3`.`b`) or
isnull(`test`.`t3`.`c`) or isnull(`test`.`t4`.`c`)) and ((`test`.`t5`.`a` >= 2)
or isnull(`test`.`t5`.`c`)) and ((`test`.`t6`.`a` >= 4) or
isnull(`test`.`t6`.`c`)) and ((`test`.`t7`.`a` <= 2) or
isnull(`test`.`t7`.`c`)) and ((`test`.`t8`.`a` < 1) or isnull(`test`.`t8`.`c`))
and ((`test`.`t9`.`b` = `test`.`t8`.`b`) or isnull(`test`.`t8`.`c`)))
Warnings:
SELECT t0.a,t0.b,t1.a,t1.b,t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,
t5.a,t5.b,t6.a,t6.b,t7.a,t7.b,t8.a,t8.b,t9.a,t9.b
=== modified file 'mysql-test/suite/pbxt/r/negation_elimination.result'
--- a/mysql-test/suite/pbxt/r/negation_elimination.result 2009-04-02
10:03:14 +0000
+++ b/mysql-test/suite/pbxt/r/negation_elimination.result 2009-11-24
10:19:08 +0000
@@ -327,7 +327,7 @@ a
0
explain select * from t1 where not((a < 5 or a < 10) and (not(a > 16) or a >
17));
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t1 range a a 5 NULL 1 Using
where; Using index
+1 SIMPLE t1 range a a 5 NULL 3 Using
where; Using index
select * from t1 where not((a < 5 or a < 10) and (not(a > 16) or a > 17));
a
10
@@ -342,7 +342,7 @@ a
19
explain select * from t1 where not((a < 5 and a < 10) and (not(a > 16) or a >
17));
id select_type table type possible_keys key key_len ref
rows Extra
-1 SIMPLE t1 range a a 5 NULL 1 Using
where; Using index
+1 SIMPLE t1 range a a 5 NULL 4 Using
where; Using index
select * from t1 where not((a < 5 and a < 10) and (not(a > 16) or a > 17));
a
5
=== modified file 'mysql-test/suite/pbxt/r/ps_grant.result'
--- a/mysql-test/suite/pbxt/r/ps_grant.result 2009-04-02 10:03:14 +0000
+++ b/mysql-test/suite/pbxt/r/ps_grant.result 2009-11-24 10:19:08 +0000
@@ -31,20 +31,20 @@ grant select on mysqltest.t1 to second_u
identified by 'looser' ;
show grants for second_u...@localhost ;
Grants for second_u...@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
drop table mysqltest.t9 ;
show grants for second_u...@localhost ;
Grants for second_u...@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
show grants for second_u...@localhost ;
Grants for second_u...@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
'*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
prepare s_t1 from 'select a as my_col from t1' ;
execute s_t1 ;
my_col
=== modified file 'mysql-test/suite/pbxt/r/skip_grants.result'
--- a/mysql-test/suite/pbxt/r/skip_grants.result 2009-04-02 10:03:14
+0000
+++ b/mysql-test/suite/pbxt/r/skip_grants.result 2009-11-24 10:19:08
+0000
@@ -54,7 +54,7 @@ SHOW CREATE VIEW v3;
View Create View character_set_client collation_connection
v3 CREATE ALGORITHM=UNDEFINED definer=...@`` SQL SECURITY DEFINER VIEW
`v3` AS select `test`.`t1`.`c` AS `c` from `t1` latin1 latin1_swedish_ci
Warnings:
-Warning 1356 View 'test.v3' references invalid table(s) or column(s)
or function(s) or definer/invoker of view lack rights to use them
+Note 1449 The user specified as a definer ('a'@'') does not exist
SHOW CREATE PROCEDURE p3;
Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
p3 CREATE definer=...@`` PROCEDURE `p3`()
=== modified file 'mysql-test/suite/pbxt/r/subselect.result'
--- a/mysql-test/suite/pbxt/r/subselect.result 2009-10-16 12:45:42 +0000
+++ b/mysql-test/suite/pbxt/r/subselect.result 2009-11-24 10:19:08 +0000
@@ -75,7 +75,7 @@ SELECT 1 FROM (SELECT 1 as a) b WHERE 1
select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1));
ERROR HY000: Incorrect usage of PROCEDURE and subquery
SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
-ERROR HY000: Incorrect usage of PROCEDURE and subquery
+ERROR HY000: Incorrect parameters to procedure 'ANALYSE'
SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
ERROR 42S22: Unknown column 'a' in 'field list'
SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
=== modified file 'mysql-test/suite/pbxt/r/view_grant.result'
--- a/mysql-test/suite/pbxt/r/view_grant.result 2009-08-17 15:57:58 +0000
+++ b/mysql-test/suite/pbxt/r/view_grant.result 2009-11-24 10:19:08 +0000
@@ -605,7 +605,7 @@ SHOW CREATE VIEW v;
View Create View character_set_client collation_connection
v CREATE ALGORITHM=UNDEFINED definer=`no-such-us...@`localhost` SQL
SECURITY DEFINER VIEW `v` AS select `test`.`t1`.`a` AS `a` from `t1` latin1
latin1_swedish_ci
Warnings:
-Warning 1356 View 'test.v' references invalid table(s) or column(s)
or function(s) or definer/invoker of view lack rights to use them
+Note 1449 The user specified as a definer ('no-such-user'@'localhost')
does not exist
SELECT * FROM v;
ERROR HY000: The user specified as a definer ('no-such-user'@'localhost') does
not exist
DROP VIEW v;
@@ -936,7 +936,7 @@ SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED definer=`no_su...@`user_1` SQL SECURITY
DEFINER VIEW `v1` AS select `test`.`t1`.`i` AS `i` from `t1` latin1
latin1_swedish_ci
Warnings:
-Warning 1356 View 'test.v1' references invalid table(s) or column(s)
or function(s) or definer/invoker of view lack rights to use them
+Note 1449 The user specified as a definer ('no_such'@'user_1') does not
exist
ALTER ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
Warnings:
Note 1449 The user specified as a definer ('no_such'@'user_1') does not
exist
@@ -944,7 +944,7 @@ SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=MERGE definer=`no_su...@`user_1` SQL SECURITY DEFINER
VIEW `v1` AS select `test`.`t1`.`i` AS `i` from `t1` latin1
latin1_swedish_ci
Warnings:
-Warning 1356 View 'test.v1' references invalid table(s) or column(s)
or function(s) or definer/invoker of view lack rights to use them
+Note 1449 The user specified as a definer ('no_such'@'user_1') does not
exist
ALTER ALGORITHM=TEMPTABLE definer=no_s...@user_2 VIEW v1 AS SELECT * FROM t1;
Warnings:
Note 1449 The user specified as a definer ('no_such'@'user_2') does not
exist
@@ -952,7 +952,7 @@ SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=TEMPTABLE definer=`no_su...@`user_2` SQL SECURITY
DEFINER VIEW `v1` AS select `test`.`t1`.`i` AS `i` from `t1` latin1
latin1_swedish_ci
Warnings:
-Warning 1356 View 'test.v1' references invalid table(s) or column(s)
or function(s) or definer/invoker of view lack rights to use them
+Note 1449 The user specified as a definer ('no_such'@'user_2') does not
exist
DROP VIEW v1;
DROP TABLE t1;
End of 5.1 tests.
=== modified file 'mysql-test/suite/pbxt/t/grant.test'
--- a/mysql-test/suite/pbxt/t/grant.test 2009-04-02 10:03:14 +0000
+++ b/mysql-test/suite/pbxt/t/grant.test 2009-11-24 10:19:08 +0000
@@ -876,6 +876,7 @@ GRANT INSERT, SELECT, CREATE, ALTER, DRO
DROP TABLE mysqltest1.t2;
connect (conn42,localhost,mysqltest_1,,mysqltest1);
+--sorted_result
SHOW GRANTS;
RENAME TABLE t1 TO t2;
RENAME TABLE t2 TO t1;
@@ -887,6 +888,7 @@ REVOKE DROP, INSERT ON mysqltest1.t1 FRO
REVOKE DROP, INSERT ON mysqltest1.t2 FROM mysqltes...@localhost;
connect (conn42,localhost,mysqltest_1,,mysqltest1);
+--sorted_result
SHOW GRANTS;
--error ER_TABLEACCESS_DENIED_ERROR
RENAME TABLE t1 TO t2;
=== modified file 'mysql-test/suite/pbxt/t/ps_grant.test'
--- a/mysql-test/suite/pbxt/t/ps_grant.test 2009-04-02 10:03:14 +0000
+++ b/mysql-test/suite/pbxt/t/ps_grant.test 2009-11-24 10:19:08 +0000
@@ -64,8 +64,10 @@ select a as my_col from t1;
connection default;
grant select on mysqltest.t1 to second_u...@localhost
identified by 'looser' ;
+--sorted_result
show grants for second_u...@localhost ;
drop table mysqltest.t9 ;
+--sorted_result
show grants for second_u...@localhost ;
@@ -73,6 +75,7 @@ show grants for second_u...@localhost ;
## switch to the second session
connection con3;
######## Question 1: The table t1 should be now accessible. ########
+--sorted_result
show grants for second_u...@localhost ;
prepare s_t1 from 'select a as my_col from t1' ;
execute s_t1 ;
=== modified file 'mysql-test/suite/pbxt/t/subselect.test'
--- a/mysql-test/suite/pbxt/t/subselect.test 2009-11-06 17:22:32 +0000
+++ b/mysql-test/suite/pbxt/t/subselect.test 2009-11-24 10:19:08 +0000
@@ -28,9 +28,9 @@ SELECT * FROM (SELECT 1 as id) b WHERE i
SELECT * FROM (SELECT 1) a WHERE 1 IN (SELECT 1,1);
SELECT 1 IN (SELECT 1);
SELECT 1 FROM (SELECT 1 as a) b WHERE 1 IN (SELECT (SELECT a));
--- error 1221
-select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1));
-- error ER_WRONG_USAGE
+select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1));
+-- error ER_WRONG_PARAMETERS_TO_PROCEDURE
SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
-- error ER_BAD_FIELD_ERROR
SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
