1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dialog to not provide plugin-dir path to mysqltest

Browse Source 
plugin-dir is provided via --defaults-file=<config-file> already part of
the exec call.
This commit is contained in:
Vicențiu Ciorbaru 2020-04-08 15:09:47 +03:00
parent 4bc31a904f
commit 609a9312dc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/plugins/t/dialog.test
View File

@ -15,8 +15,6 @@ if (!$DIALOG_EXAMPLES_SO) {
eval install plugin three_attempts soname '$DIALOG_EXAMPLES_SO'; eval install plugin three_attempts soname '$DIALOG_EXAMPLES_SO';
create user test_dialog identified via three_attempts using 'SECRET'; create user test_dialog identified via three_attempts using 'SECRET';
let $plugindir=`SELECT @@global.plugin_dir`;
--write_file $MYSQLTEST_VARDIR/tmp/dialog_good.txt --write_file $MYSQLTEST_VARDIR/tmp/dialog_good.txt
foo foo
1234 1234
@ -34,19 +32,19 @@ EOF
--echo # --echo #
--echo # -pSECRET is picked up, no questions asked. --echo # -pSECRET is picked up, no questions asked.
--echo # --echo #
--exec echo "select user(), current_user();"|$MYSQL_TEST -u test_dialog -pSECRET --plugin-dir=$plugindir --exec echo "select user(), current_user();"|$MYSQL_TEST -u test_dialog -pSECRET
--echo # --echo #
--echo # without -p. up to three questions are asked on the stdin. --echo # without -p. up to three questions are asked on the stdin.
--echo # athentication is successful, the correct pasword is on the third line --echo # athentication is successful, the correct pasword is on the third line
--echo # --echo #
--exec $MYSQL_TEST -u test_dialog --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/dialog_good.txt --exec $MYSQL_TEST -u test_dialog < $MYSQLTEST_VARDIR/tmp/dialog_good.txt
--echo # --echo #
--echo # athentication is unsuccessful, first three lines are all wrong --echo # athentication is unsuccessful, first three lines are all wrong
--echo # --echo #
--error 1 --error 1
--exec $MYSQL_TEST -u test_dialog --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/dialog_bad.txt --exec $MYSQL_TEST -u test_dialog < $MYSQLTEST_VARDIR/tmp/dialog_bad.txt
--remove_file $MYSQLTEST_VARDIR/tmp/dialog_good.txt --remove_file $MYSQLTEST_VARDIR/tmp/dialog_good.txt
--remove_file $MYSQLTEST_VARDIR/tmp/dialog_bad.txt --remove_file $MYSQLTEST_VARDIR/tmp/dialog_bad.txt