Commit a0f00ce9 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

Merge bk-internal:/home/bk/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents fb30aeaa c674b88b
...@@ -90,3 +90,4 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -90,3 +90,4 @@ id select_type table type possible_keys key key_len ref rows Extra
select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
c c
28 28
drop table t1;
...@@ -8,4 +8,5 @@ create database d2; ...@@ -8,4 +8,5 @@ create database d2;
ERROR 42000: Access denied for user 'sample'@'localhost' to database 'd2' ERROR 42000: Access denied for user 'sample'@'localhost' to database 'd2'
create database D1; create database D1;
ERROR 42000: Access denied for user 'sample'@'localhost' to database 'D1' ERROR 42000: Access denied for user 'sample'@'localhost' to database 'D1'
drop user 'sample'@'localhost';
drop database if exists d1; drop database if exists d1;
...@@ -69,5 +69,5 @@ explain select count(*) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; ...@@ -69,5 +69,5 @@ explain select count(*) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
select count(*) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; select count(*) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
explain select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; explain select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
drop table t1;
# End of 4.1 tests # End of 4.1 tests
...@@ -21,6 +21,7 @@ create database D1; ...@@ -21,6 +21,7 @@ create database D1;
disconnect sample; disconnect sample;
connection master; connection master;
drop user 'sample'@'localhost';
drop database if exists d1; drop database if exists d1;
disconnect master; disconnect master;
connection default; connection default;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment