← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/options.h

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-07 19:16:29 UTC
  • mfrom: (920 drizzle)
  • mto: (934.3.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 938.
  • Revision ID: osullivan.padraig@gmail.com-20090307191629-fjdt66ccncs295kk
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/options.h
32
32
{
33
33
  DRIZZLE_OPT_CONNECT_TIMEOUT, DRIZZLE_OPT_COMPRESS, DRIZZLE_OPT_NAMED_PIPE,
34
34
  DRIZZLE_INIT_COMMAND, DRIZZLE_READ_DEFAULT_FILE, DRIZZLE_READ_DEFAULT_GROUP,
35
 
  DRIZZLE_OPT_LOCAL_INFILE,
36
35
  DRIZZLE_OPT_PROTOCOL, DRIZZLE_SHARED_MEMORY_BASE_NAME, DRIZZLE_OPT_READ_TIMEOUT,
37
36
  DRIZZLE_OPT_WRITE_TIMEOUT, DRIZZLE_OPT_USE_RESULT,
38
37
  DRIZZLE_OPT_USE_REMOTE_CONNECTION,