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.5 into 10.6

Browse Source 
Note: Changes to the test innodb.stats_persistent
in commit e5c4c0842d (MDEV-35443)
are not merged, because the test scenario is impossible
due to commit e66928ab28 (MDEV-33462).
This commit is contained in:
Marko Mäkelä
2025-01-03 09:10:25 +02:00
parent 07b77e862c 24e5d56400
commit f20ee931d8
8 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/lib/mtr_report.pm
View File

@@ -454,9 +454,8 @@ sub mtr_report_stats ($$$$) {
# Print info about reporting the error
print
"The log files in var/log may give you some hint of what went wrong.\n\n",
"If you want to report this error, please read first ",
"the documentation\n",
"at http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n\n";
"If you want to report this error, MariaDB's bug tracker is found at\n",
"https://jira.mariadb.org\n\n";
}
else

5
mysql-test/lib/v1/mtr_report.pl
View File

@@ -198,9 +198,8 @@ sub mtr_report_stats ($) {
print
"The log files in var/log may give you some hint\n",
"of what went wrong.\n",
"If you want to report this error, please read first ",
"the documentation at\n",
"http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n";
"If you want to report this error, MariaDB's bug tracker is found at\n",
"https://jira.mariadb.org\n"
}
if (!$::opt_extern)
{