~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/handshake.c

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
510
510
  if (con->options & DRIZZLE_CON_ADMIN)
511
511
    capabilities|= DRIZZLE_CAPABILITIES_ADMIN;
512
512
 
 
513
  if (con->options & DRIZZLE_CON_INTERACTIVE)
 
514
  {
 
515
    capabilities|= DRIZZLE_CAPABILITIES_INTERACTIVE;
 
516
  }
 
517
 
513
518
  capabilities&= ~(DRIZZLE_CAPABILITIES_COMPRESS | DRIZZLE_CAPABILITIES_SSL);
514
519
  if (con->db[0] == 0)
515
520
    capabilities&= ~DRIZZLE_CAPABILITIES_CONNECT_WITH_DB;