← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2010-12-20 19:20:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2016.
  • Revision ID: brian@tangent.org-20101220192057-1ch4b9uo008d8rje
Merge in additional fixes for sign, plus alter table, plus TIME on
processlist.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
200
200
}
201
201
 
202
202
static void GoogleProtoErrorThrower(google::protobuf::LogLevel level, const char* filename,
203
 
                       int line, const string& message) throw(const char *)
 
203
                                    int line, const string& message) throw(const char *)
204
204
{
 
205
  (void)level;
205
206
  (void)filename;
206
207
  (void)line;
207
208
  (void)message;
 
209
#if 0
208
210
  std::cerr << "\n";
209
211
  drizzled::util::custom_backtrace();
210
212
  std::cerr << "\n";
 
213
#endif
211
214
  switch(level)
212
215
  {
213
216
  case google::protobuf::LOGLEVEL_INFO:
216
219
  case google::protobuf::LOGLEVEL_ERROR:
217
220
  case google::protobuf::LOGLEVEL_FATAL:
218
221
  default:
 
222
#if 0
219
223
    std::cerr << "GoogleProtoErrorThrower(" << filename << ", " << line << ", " << message << ")";
 
224
#endif
220
225
    throw("error in google protocol buffer parsing");
221
226
  }
222
227
}