Skip to content

M
MariaDB
Commit 6736c1b9 authored by kaa@kaamos.(none)'s avatar kaa@kaamos.(none)
Browse files
Options

Post-merge fix after merging the patch for bug#31590 to 5.1: 

suppress the "Out of sort memory" error in the error log.
parent eeab00e3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
mysql-test/lib/mtr_report.pl
View file @ 6736c1b9
...@@ -363,7 +363,10 @@ sub mtr_report_stats ($) { ...@@ -363,7 +363,10 @@ sub mtr_report_stats ($) {
# master # master
/Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or
/Slave: Can't DROP 'c7'.* 1091/ or /Slave: Can't DROP 'c7'.* 1091/ or
/Slave: Key column 'c6'.* 1072/ /Slave: Key column 'c6'.* 1072/ or
# Test case for Bug#31590 produces the following error:
/Out of sort memory; increase server sort buffer size/
) )
{ {
next; # Skip these lines next; # Skip these lines
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7