← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to sql/sql_parse.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_parse.cc
917
917
  DEBUG_SYNC(thd,"dispatch_command_before_set_time");
918
918
 
919
919
  thd->set_time();
920
 
  thd->set_query_id(get_query_id());
921
 
  if (!(server_command_flags[command] & CF_SKIP_QUERY_ID))
922
 
    next_query_id();
 
920
  if (server_command_flags[command] & CF_SKIP_QUERY_ID)
 
921
    thd->set_query_id(get_query_id());
 
922
  else
 
923
    thd->set_query_id(next_query_id());
923
924
  inc_thread_running();
924
925
 
925
926
  if (!(server_command_flags[command] & CF_SKIP_QUESTIONS))