Commit b7dd49b0 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents a63413b8 eb5d7145

mysql-test/r/limit.result

+1 −0
Original line number Diff line number Diff line
@@ -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;

c

28

drop table t1;

mysql-test/r/lowercase_fs_off.result

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ create database d2; 
ERROR 42000: Access denied for user 'sample'@'localhost' to database 'd2'

create database D1;

ERROR 42000: Access denied for user 'sample'@'localhost' to database 'D1'

drop user 'sample'@'localhost';

drop database if exists d1;

mysql-test/t/limit.test

+1 −1
Original line number Diff line number Diff line
@@ -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;

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;



drop table t1;

# End of 4.1 tests

mysql-test/t/lowercase_fs_off.test

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ create database D1; 
disconnect sample;



connection master;

drop user 'sample'@'localhost';

drop database if exists d1;

disconnect master;

connection default;