database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-04 14:52:25 +02:00
parent b5a54e8a93 fe38d7cad4
commit 8356fb68c3
188 changed files with 3169 additions and 2297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/have_gzip.inc Normal file
View File

@@ -0,0 +1,6 @@
--error 0,1,127
--exec gzip --version > /dev/null 2> /dev/null
if ($sys_errno)
{
--skip Requires gzip executable
}

7
mysql-test/include/maybe_versioning.combinations Normal file
View File

@@ -0,0 +1,7 @@
[orig]
[vers]
system_versioning_alter_history=keep
[vers_trx]
system_versioning_alter_history=keep

47
mysql-test/include/maybe_versioning.inc Normal file
View File

@@ -0,0 +1,47 @@
# include file for test files that can be run with and without debug
# having debug and non-debug tests.
# If $modify_create_table is true CREATE statement must be evaluated with
# $create_options that adds WITH SYSTEM VERSIONING to the statement. Otherwise
# system versioning is added implicitly via debug options. The second variant
# can easily be added to any test but works only for debug builds.
if ($modify_create_table)
{
if ($MTR_COMBINATION_VERS)
{
let $create_options= `select ' WITH SYSTEM VERSIONING'`;
}
if ($MTR_COMBINATION_VERS_TRX)
{
--skip Not tested
}
}
if (!$modify_create_table)
{
let $have_debug=`select version() like '%debug%'`;
if ($MTR_COMBINATION_VERS)
{
if (!$have_debug)
{
--skip Requires debug
}
--disable_query_log
set debug_dbug="d,sysvers_force_trx,sysvers_hide";
--enable_query_log
}
if ($MTR_COMBINATION_VERS_TRX)
{
if (!$have_debug)
{
--skip Requires debug
}
--disable_query_log
set debug_dbug="d,sysvers_force,sysvers_hide";
--enable_query_log
}
}

19
mysql-test/include/start_mysqld.inc
View File

@@ -12,25 +12,32 @@ if (!$restart_noprint)
--let $restart_noprint=0
}
--let $restart_cmd= restart
if ($restart_bindir)
{
--let $restart_cmd= restart_bindir $restart_bindir
}
if ($restart_parameters)
{
--exec echo "restart: $restart_parameters" > $_expect_file_name
--exec echo "$restart_cmd: $restart_parameters" > $_expect_file_name
if (!$restart_noprint)
{
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec echo "# restart: $restart_parameters"
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec echo "# $restart_cmd: $restart_parameters"
}
if ($restart_noprint == 1)
{
--exec echo "# restart: with restart_parameters"
--exec echo "# $restart_cmd: with restart_parameters"
}
}
if (!$restart_parameters)
{
--exec echo "restart" > $_expect_file_name
--exec echo "$restart_cmd" > $_expect_file_name
if ($restart_noprint < 2)
{
--exec echo "# restart"
--exec echo "# $restart_cmd"
}
}