diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-21 09:42:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-21 09:42:10 +0200 |
| commit | 911c182647f4e2aa992e55965f1a4d35e4b63da3 (patch) | |
| tree | 46bdba5c505ff6a94d63be0e9eb8d241013e0ef3 | |
| parent | 6d7d8dd95587f5aa50e3116bec0ae8170a5d70f8 (diff) | |
| download | mariadb-git-911c182647f4e2aa992e55965f1a4d35e4b63da3.tar.gz | |
fixes for buildbot
| -rw-r--r-- | mysql-test/r/empty_user_table.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/r/distinct.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/distinct.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/empty_user_table.test | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/empty_user_table.result b/mysql-test/r/empty_user_table.result index df9d803e5c0..b93596ab59a 100644 --- a/mysql-test/r/empty_user_table.result +++ b/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; diff --git a/mysql-test/suite/maria/r/distinct.result b/mysql-test/suite/maria/r/distinct.result index 04d5e3d6a2c..7963e7b72ff 100644 --- a/mysql-test/suite/maria/r/distinct.result +++ b/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 diff --git a/mysql-test/suite/maria/t/distinct.test b/mysql-test/suite/maria/t/distinct.test index b30d97b8383..c71a172597c 100644 --- a/mysql-test/suite/maria/t/distinct.test +++ b/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; diff --git a/mysql-test/t/empty_user_table.test b/mysql-test/t/empty_user_table.test index 7e672cc64f6..b54f2109e30 100644 --- a/mysql-test/t/empty_user_table.test +++ b/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; |