← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Brian Aker
  • Date: 2011-02-23 17:21:37 UTC
  • mto: (2194.4.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2197.
  • Revision ID: brian@tangent.org-20110223172137-osvxpud8m7354p1q
Add in interactive mode back to protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
4222
4222
  drizzle_create(&drizzle);
4223
4223
 
4224
4224
#ifdef DRIZZLE_ADMIN_TOOL
4225
 
  drizzle_con_options_t options= (drizzle_con_options_t) (DRIZZLE_CON_ADMIN | DRIZZLE_CON_INTERACTIVE | (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL));
 
4225
  drizzle_con_options_t options= (drizzle_con_options_t) (DRIZZLE_CON_ADMIN | (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL|DRIZZLE_CON_INTERACTIVE));
4226
4226
#else
4227
 
  drizzle_con_options_t options= (drizzle_con_options_t) (DRIZZLE_CON_INTERACTIVE | use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL);
 
4227
  drizzle_con_options_t options= (drizzle_con_options_t) (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL|DRIZZLE_CON_INTERACTIVE);
4228
4228
#endif
4229
4229
 
4230
4230
  if (drizzle_con_add_tcp(&drizzle, &con, (char *)host.c_str(),