diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-21 01:55:12 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-21 01:55:12 +0200 |
| commit | bebf3d1d8ba927ca39c00608da2028e61ffd32b9 (patch) | |
| tree | 5f7344ded1ca340e30fe16a2d068b2af2c7f7471 | |
| parent | d7283f54fec459ab7579ccc017573f62432a2e3e (diff) | |
| parent | 8d7e105f164c1c7b078a959095a0c308310ac932 (diff) | |
| download | mariadb-git-bebf3d1d8ba927ca39c00608da2028e61ffd32b9.tar.gz | |
Merge with 5.1
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 | ||||
| -rw-r--r-- | sql/signal_handler.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 40a6282e8ef..1b1712b57cb 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4458,9 +4458,9 @@ sub extract_warning_lines ($) { qr/Failed on request_dump/, qr/Slave: Can't drop database.* database doesn't exist/, qr/Slave: Operation DROP USER failed for 'create_rout_db'/, - qr|Checking table: '\./mtr/test_suppressions'|, + qr|Checking table: '\..mtr.test_suppressions'|, qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|, - qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|, + qr|mysqld: Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|, qr|InnoDB: Error: table 'test/bug39438'|, qr|Access denied for user|, qr|Aborted connection|, diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index 62f8190010f..8128dddc7ee 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -92,10 +92,10 @@ extern "C" sig_handler handle_fatal_signal(int sig) my_safe_printf_stderr("%s", "This could be because you hit a bug. It is also possible that this binary\n" "or one of the libraries it was linked against is corrupt, improperly built,\n" - "or misconfigured. This error can also be caused by malfunctioning hardware.\n"); + "or misconfigured. This error can also be caused by malfunctioning hardware.\n\n"); my_safe_printf_stderr("%s", - "To report this bug, see http://kb.askmonty.org/en/reporting-bugs\n"); + "To report this bug, see http://kb.askmonty.org/en/reporting-bugs\n\n"); my_safe_printf_stderr("%s", "We will try our best to scrape up some info that will hopefully help\n" |