5.3 merge

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