← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/console/console.cc

  • Committer: Brian Aker
  • Date: 2011-01-24 04:10:04 UTC
  • mto: (2109.2.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2111.
  • Revision ID: brian@tangent.org-20110124041004-ze833jg5bi2fbd41
Merge in update to use console for catalog DDL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/console/console.cc
133
133
    }
134
134
    while (cin.eof() == false && cin.fail() == true);
135
135
 
136
 
    if ((*packet_length == 1 && cin.eof() == true) ||
137
 
        !strncasecmp(*packet + 1, "quit", 4) ||
138
 
        !strncasecmp(*packet + 1, "exit", 4))
 
136
    if ((*packet_length == 1 && cin.eof() == true) or
 
137
        not strncasecmp(*packet + 1, "quit", 4) or
 
138
        not strncasecmp(*packet + 1, "exit", 4) or
 
139
        not strncasecmp(*packet + 1, "shutdown", sizeof("shutdown") -1))
139
140
    {
140
141
      is_dead= true;
141
142
      *packet_length= 1;
363
364
  context("password",
364
365
          po::value<string>(),
365
366
          N_("Password to use for auth."));
366
 
  context("db",
 
367
  context("schema",
367
368
          po::value<string>(),
368
 
          N_("Default database to use."));
 
369
          N_("Default schema to use."));
369
370
}
370
371
 
371
372
DRIZZLE_DECLARE_PLUGIN
372
373
{
373
374
  DRIZZLE_VERSION_ID,
374
375
  "console",
375
 
  "0.1",
 
376
  "0.2",
376
377
  "Eric Day",
377
378
  "Console Client",
378
379
  PLUGIN_LICENSE_BSD,