← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to sql/sql_parse.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-07-21 07:09:29 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20150721070929-mg4dpqkgg3it1ajf
Tags: upstream-5.6.25
Import upstream version 5.6.25

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_parse.cc
1613
1613
#ifndef EMBEDDED_LIBRARY
1614
1614
  case COM_SHUTDOWN:
1615
1615
  {
1616
 
    if (packet_length < 1)
1617
 
    {
1618
 
      my_error(ER_MALFORMED_PACKET, MYF(0));
1619
 
      break;
1620
 
    }
1621
1616
    status_var_increment(thd->status_var.com_other);
1622
1617
    if (check_global_access(thd,SHUTDOWN_ACL))
1623
1618
      break; /* purecov: inspected */
1628
1623
      packet[0].
1629
1624
    */
1630
1625
    enum mysql_enum_shutdown_level level;
1631
 
    if (!thd->is_valid_time())
 
1626
    if (packet_length == 0 || !thd->is_valid_time())
1632
1627
      level= SHUTDOWN_DEFAULT;
1633
1628
    else
1634
1629
      level= (enum mysql_enum_shutdown_level) (uchar) packet[0];