← Back to branch summary

~ubuntu-branches/ubuntu/vivid/drizzle/vivid-proposed

« back to all changes in this revision

Viewing changes to plugin/innobase/ut/ut0dbg.cc

  • Committer: Package Import Robot
  • Author(s): Tobias Frost
  • Date: 2013-08-22 20:18:31 UTC
  • mto: (20.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 21.
  • Revision ID: package-import@ubuntu.com-20130822201831-gn3ozsh7o7wmc5tk
Tags: upstream-7.2.3
Import upstream version 7.2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0dbg.cc
25
25
 
26
26
#include "univ.i"
27
27
#include "ut0dbg.h"
 
28
#include "ha_prototypes.h"
28
29
 
29
30
#if defined(__GNUC__) && (__GNUC__ > 2)
30
31
#else
58
59
        ut_print_timestamp(stderr);
59
60
#ifdef UNIV_HOTBACKUP
60
61
        fprintf(stderr, "  InnoDB: Assertion failure in file %s line %lu\n",
61
 
                file, line);
 
62
                innobase_basename(file), line);
62
63
#else /* UNIV_HOTBACKUP */
63
64
        fprintf(stderr,
64
65
                "  InnoDB: Assertion failure in thread %lu"
65
66
                " in file %s line %lu\n",
66
 
                os_thread_pf(os_thread_get_curr_id()), file, line);
 
67
                os_thread_pf(os_thread_get_curr_id()),
 
68
                innobase_basename(file), line);
67
69
#endif /* UNIV_HOTBACKUP */
68
70
        if (expr) {
69
71
                fprintf(stderr,
77
79
              " or crashes, even\n"
78
80
              "InnoDB: immediately after the mysqld startup, there may be\n"
79
81
              "InnoDB: corruption in the InnoDB tablespace. Please refer to\n"
80
 
              "InnoDB: " REFMAN "forcing-recovery.html\n"
 
82
              "InnoDB: " REFMAN "forcing-innodb-recovery.html\n"
81
83
              "InnoDB: about forcing recovery.\n", stderr);
82
84
#if defined(UNIV_SYNC_DEBUG) || !defined(UT_DBG_USE_ABORT)
83
85
        ut_dbg_stop_threads = TRUE;
96
98
{
97
99
#ifndef UNIV_HOTBACKUP
98
100
        fprintf(stderr, "InnoDB: Thread %lu stopped in file %s line %lu\n",
99
 
                os_thread_pf(os_thread_get_curr_id()), file, line);
 
101
                os_thread_pf(os_thread_get_curr_id()),
 
102
                innobase_basename(file), line);
100
103
        os_thread_sleep(1000000000);
101
104
#endif /* !UNIV_HOTBACKUP */
102
105
}