diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
| commit | 68baf07dcd985376fae9d24c12ee0ff560b61e8f (patch) | |
| tree | 175f775e9847a50e7b51162573ae24f276abea96 /mysql-test/suite/plugins | |
| parent | cbaf6e6b61241db6e97648c73dbeb0a15614a7aa (diff) | |
| parent | 362c2bca3e170031d33622f27d978c9570d0a9f5 (diff) | |
| download | mariadb-git-68baf07dcd985376fae9d24c12ee0ff560b61e8f.tar.gz | |
5.3 merge
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/r/pam.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/pam.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/plugins/r/pam.result b/mysql-test/suite/plugins/r/pam.result index 432fb48eb5a..86303206b3b 100644 --- a/mysql-test/suite/plugins/r/pam.result +++ b/mysql-test/suite/plugins/r/pam.result @@ -4,7 +4,7 @@ create user pam_test; grant proxy on pam_test to test_pam; # # athentication is successful, challenge/pin are ok -# note that current_user() differts from user() +# note that current_user() differs from user() # Challenge input first. Enter: not very secret challenge diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test index 587a2380f94..68fa349a444 100644 --- a/mysql-test/suite/plugins/t/pam.test +++ b/mysql-test/suite/plugins/t/pam.test @@ -26,7 +26,7 @@ EOF --echo # --echo # athentication is successful, challenge/pin are ok ---echo # note that current_user() differts from user() +--echo # note that current_user() differs from user() --echo # --exec $MYSQL_TEST -u test_pam --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/pam_good.txt |