diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 15:02:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 15:02:17 +0200 |
| commit | 352d7cad1b891187ef50c43712aa66824576e848 (patch) | |
| tree | 782f83c4f5056255f7e3e8609950fdd8211244ea /mysql-test | |
| parent | 8c2bb705f11956cdc0acb67182466a903dcdd19b (diff) | |
| parent | 807f537f328c284cd2834e8a860f39f516474ff6 (diff) | |
| download | mariadb-git-352d7cad1b891187ef50c43712aa66824576e848.tar.gz | |
merge
Diffstat (limited to 'mysql-test')
| -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 1c9036c317e..d1b2d291941 100644 --- a/mysql-test/suite/plugins/r/pam.result +++ b/mysql-test/suite/plugins/r/pam.result @@ -2,7 +2,7 @@ install plugin pam soname 'auth_pam.so'; create user test_pam identified via pam using 'mariadb_mtr'; # # 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 3f4c563d8dc..1968d7fdaa6 100644 --- a/mysql-test/suite/plugins/t/pam.test +++ b/mysql-test/suite/plugins/t/pam.test @@ -29,7 +29,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 |