mirror of
https://github.com/MariaDB/server.git
synced 2025-10-31 19:06:14 +01:00
689bed1940
This commit introduces an additional command line option to the mariadb client. --script-dir=<directory> will cause the `source` command to look for files initially in CWD, then in <script-dir> if not found in CWD.
111 lines
3.7 KiB
Text
111 lines
3.7 KiB
Text
--source include/not_embedded.inc
|
|
|
|
--echo #
|
|
--echo # MDEV-34704: Quick mode produces the bug for mariadb client
|
|
--echo #
|
|
|
|
|
|
create table t1 (aaaaaaaaa char (5), aaaaa char (10), a char (127), b char(1));
|
|
insert into t1 values ("X", "X", "X", "X");
|
|
|
|
|
|
--echo # --table --quick
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick 2>&1
|
|
|
|
|
|
--echo # --table --quick --quick-max-column-width=0
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=0 2>&1
|
|
|
|
|
|
--echo # --table --quick --quick-max-column-width=10
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=10 2>&1
|
|
|
|
|
|
--echo # --table --quick --quick-max-column-width=20
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=20 2>&1
|
|
|
|
insert into t1 values ("01234", "0123456789", "01234567890123456789", "1");
|
|
|
|
--echo # --table --quick
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick 2>&1
|
|
|
|
|
|
--echo # --table --quick --quick-max-column-width=0
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=0 2>&1
|
|
|
|
--echo # --table --quick --quick-max-column-width=10
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=10 2>&1
|
|
|
|
--echo # --table --quick --quick-max-column-width=20
|
|
--exec echo "select * from test.t1;" | $MYSQL --table --quick --quick-max-column-width=20 2>&1
|
|
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # End of 10.5 tests
|
|
--echo #
|
|
|
|
--echo #
|
|
--echo # MDEV-23818: mysql option --script-dir
|
|
--echo #
|
|
|
|
--echo # test 1: can't find the file at all
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--error 1
|
|
--exec echo "source file1;" | $MYSQL --script-dir=$MYSQLTEST_VARDIR/dir1/ 2>&1
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|
|
|
|
--echo # test 2: file in the current working directory
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--write_file $MYSQLTEST_VARDIR/file1.sql
|
|
select 1;
|
|
EOF
|
|
--exec echo "source $MYSQLTEST_VARDIR/file1.sql;" | $MYSQL --script-dir=$MYSQLTEST_VARDIR/dir1/ 2>&1
|
|
--remove_file $MYSQLTEST_VARDIR/file1.sql
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|
|
|
|
--echo # test 3: file is present in CWD and also in script-dir
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--write_file $MYSQLTEST_VARDIR/file1.sql
|
|
select 'hello from file1'
|
|
EOF
|
|
--write_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
select 'hello from dir1/file1.sql';
|
|
EOF
|
|
--exec echo "source $MYSQLTEST_VARDIR/file1.sql;" | $MYSQL --script-dir=./dir1/ 2>&1
|
|
--remove_file $MYSQLTEST_VARDIR/file1.sql
|
|
--remove_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|
|
|
|
--echo # test 4: file is only present in the script-dir
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--write_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
select 'hello from dir1/file1.sql';
|
|
EOF
|
|
--exec echo "source file1.sql;" | $MYSQL --script-dir=$MYSQLTEST_VARDIR/dir1/ 2>&1
|
|
--remove_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|
|
|
|
--echo # test 5: script-dir file has source command that references CWD
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--write_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
source file2.sql;
|
|
EOF
|
|
--exec echo "select 'hello from file2.sql'" > $MYSQLTEST_VARDIR/file2.sql
|
|
--exec cd $MYSQLTEST_VARDIR && $MYSQL --script-dir=$MYSQLTEST_VARDIR/dir1/ -e "source file1.sql;" 2>&1
|
|
--remove_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
--remove_file $MYSQLTEST_VARDIR/file2.sql
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|
|
|
|
--echo # test 6: script-dir file has source command that references script-dir
|
|
--mkdir $MYSQLTEST_VARDIR/dir1
|
|
--write_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
source file2.sql;
|
|
EOF
|
|
--write_file $MYSQLTEST_VARDIR/dir1/file2.sql
|
|
select 'hello from file2.sql';
|
|
EOF
|
|
--exec echo "source file1.sql" | $MYSQL --script-dir=$MYSQLTEST_VARDIR/dir1/ 2>&1
|
|
--remove_file $MYSQLTEST_VARDIR/dir1/file1.sql
|
|
--remove_file $MYSQLTEST_VARDIR/dir1/file2.sql
|
|
--rmdir $MYSQLTEST_VARDIR/dir1
|