← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_parse.cc

Merged from Patrick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_parse.cc
822
822
      SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in
823
823
      packet[0].
824
824
    */
825
 
    enum mysql_enum_shutdown_level level=
826
 
      (enum mysql_enum_shutdown_level) (uchar) packet[0];
 
825
    enum drizzle_enum_shutdown_level level=
 
826
      (enum drizzle_enum_shutdown_level) (uchar) packet[0];
827
827
    if (level == SHUTDOWN_DEFAULT)
828
828
      level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable
829
829
    else if (level != SHUTDOWN_WAIT_ALL_BUFFERS)