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

« back to all changes in this revision

Viewing changes to sql/sql_connect.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
704
704
  user_stats->cpu_time+=   (thd->status_var.cpu_time -
705
705
                            thd->org_status_var.cpu_time); 
706
706
  /*
707
 
    This is handle specially as bytes_recieved is incremented BEFORE
 
707
    This is handle specially as bytes_received is incremented BEFORE
708
708
    org_status_var is copied.
709
709
  */
710
710
  user_stats->bytes_received+= (thd->org_status_var.bytes_received-