1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for buildbot

Browse Source
This commit is contained in:
Sergei Golubchik 2013-05-21 09:42:10 +02:00
parent 639a766096
commit fce7fc43ba
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/empty_user_table.result
View File

@ -2,7 +2,7 @@ create table t1 as select * from mysql.user;
truncate table mysql.user;
flush privileges;
connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
Got one of the listed errors
insert mysql.user select * from t1;
drop table t1;
flush privileges;

2
mysql-test/suite/maria/r/distinct.result
View File

@ -17,7 +17,7 @@ GROUP_CONCAT(a)
DROP TABLE t1;
CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x');
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b );
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY MD5( b );
MAX( a )
2
7

2
mysql-test/suite/maria/t/distinct.test
View File

@ -21,5 +21,5 @@ DROP TABLE t1;
CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x');
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b );
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY MD5( b );
DROP TABLE t1;

4
mysql-test/t/empty_user_table.test
View File

@ -8,8 +8,10 @@ create table t1 as select * from mysql.user;
truncate table mysql.user;
flush privileges;
# connecting via unix socket gives ER_ACCESS_DENIED_ERROR
# connecting via tcp/ip gives ER_HOST_NOT_PRIVILEGED
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
--error ER_ACCESS_DENIED_ERROR
--error ER_ACCESS_DENIED_ERROR,ER_HOST_NOT_PRIVILEGED
connect (fail,localhost,u1);
insert mysql.user select * from t1;