← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/errmsg_print.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/errmsg_print.cc
47
47
  errmsg_ptr= errmsg;
48
48
#endif
49
49
 
50
 
  errmsg_printf(error::ERROR, "%s: %s\n", message, errmsg);
 
50
  errmsg_printf(error::ERROR, "%s: %s\n", message, errmsg_ptr);
51
51
 
52
52
}
53
53
 
82
82
    message+= "'";
83
83
  }
84
84
 
85
 
  errmsg_printf(error::ERROR, "%s: %s\n", message.c_str(), errmsg);
 
85
  errmsg_printf(error::ERROR, "%s: %s\n", message.c_str(), errmsg_ptr);
86
86
}
87
87
 
88
88
bool errmsg_printf (error::level_t priority, char const *format, ...)