fixes for buildbot

mysql-test/r/empty_user_table.result

@@ -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;

mysql-test/suite/maria/r/distinct.result

@@ -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

mysql-test/suite/maria/t/distinct.test

@@ -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;

mysql-test/t/empty_user_table.test

@@ -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;