← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Lee Bieber
  • Date: 2010-12-24 05:08:44 UTC
  • mfrom: (2026.1.2 build)
  • Revision ID: kalebral@gmail.com-20101224050844-9jll4ywf0rmhxaf4
Merge Brian - Update to tests, we just want to look at our own tables, not global.
Merge Brian - Final bits of encapsulation work

Show diffs side-by-side

added added

removed removed

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