diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-12 14:49:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-12 14:49:41 +0200 |
| commit | bba3a1be5d5fb4099e1fe00df3f7ad172209e2bd (patch) | |
| tree | 3c4aa02f4506869824f01e7a2dda863f3c2a52a4 /storage/innobase/ut/ut0dbg.c | |
| parent | a822d65149c507c4b519aeea8a7ae30a734d0447 (diff) | |
| parent | 3f77f0dd6edbd20d1f693efb96b3d2a85a27fe00 (diff) | |
| download | mariadb-git-bba3a1be5d5fb4099e1fe00df3f7ad172209e2bd.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
sql/share/errmsg.txt:
Auto merged
storage/innobase/Makefile.am:
Auto merged
storage/innobase/handler/ha_innodb.cc:
SCCS merged
Diffstat (limited to 'storage/innobase/ut/ut0dbg.c')
| -rw-r--r-- | storage/innobase/ut/ut0dbg.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c index b2b4abd87a6..8c4be190d77 100644 --- a/storage/innobase/ut/ut0dbg.c +++ b/storage/innobase/ut/ut0dbg.c @@ -42,7 +42,7 @@ ut_dbg_assertion_failed( { ut_print_timestamp(stderr); fprintf(stderr, - "InnoDB: Assertion failure in thread %lu" + " InnoDB: Assertion failure in thread %lu" " in file %s line %lu\n", os_thread_pf(os_thread_get_curr_id()), file, line); if (expr) { @@ -50,14 +50,16 @@ ut_dbg_assertion_failed( "InnoDB: Failing assertion: %s\n", expr); } - fputs( -"InnoDB: We intentionally generate a memory trap.\n" -"InnoDB: Submit a detailed bug report to http://bugs.mysql.com.\n" -"InnoDB: If you get repeated assertion failures or crashes, even\n" -"InnoDB: immediately after the mysqld startup, there may be\n" -"InnoDB: corruption in the InnoDB tablespace. Please refer to\n" -"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n" -"InnoDB: about forcing recovery.\n", stderr); + fputs("InnoDB: We intentionally generate a memory trap.\n" + "InnoDB: Submit a detailed bug report" + " to http://bugs.mysql.com.\n" + "InnoDB: If you get repeated assertion failures" + " or crashes, even\n" + "InnoDB: immediately after the mysqld startup, there may be\n" + "InnoDB: corruption in the InnoDB tablespace. Please refer to\n" + "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" + "forcing-recovery.html\n" + "InnoDB: about forcing recovery.\n", stderr); #if defined(UNIV_SYNC_DEBUG) || !defined(UT_DBG_USE_ABORT) ut_dbg_stop_threads = TRUE; #endif |