database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-09 13:59:22 +02:00
parent 383ee364dc 887bb3f735
commit a6b2f820e0
346 changed files with 9046 additions and 2264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/main/mysqldump.test
View File

@ -2989,9 +2989,7 @@ TRUNCATE TABLE mysql.general_log;
DROP DATABASE test1;
--remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql
--echo #
--echo # End of 10.3 tests
--echo #
--echo #
--echo # MDEV-31092 mysqldump --force doesn't ignore error as it should
@ -3010,13 +3008,34 @@ drop function f2;
drop event e1;
drop table t1;
--echo #
--echo # End of 10.4 tests
--echo #
--echo # MDEV-33727 mariadb-dump trusts the server and does not validate the data
--echo #
#
# MDEV-16733 mysqldump --tab and --xml options are conflicting
#
create table t1 (a int);
--exec $MYSQL_DUMP --compact --add-drop-table test > $MYSQLTEST_VARDIR/tmp/mdev33727.sql
# first let's verify it can be loaded not only by mariadb client
--source $MYSQLTEST_VARDIR/tmp/mdev33727.sql
# and now test the mariadb client sandbox protection
--append_file $MYSQLTEST_VARDIR/tmp/mdev33727.sql
\! echo foo
EOF
--error 1
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mdev33727.sql 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/mdev33727.sql
drop table t1;
--echo # End of 10.5 tests
--echo #
--echo # MDEV-16733 mysqldump --tab and --xml options are conflicting
--echo #
--replace_result mariadb-dump.exe mariadb-dump
--error 1
--exec $MYSQL_DUMP --xml --tab=$MYSQLTEST_VARDIR/tmp 2>&1
--echo # End of 10.11 tests