← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libmysql/libmysql.c

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:25:54 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418182554-pflh0bjoc611yqxw
Tags: 5.5.31-0ubuntu0.13.04.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/libmysql.c
2107
2107
      DBUG_RETURN(1);
2108
2108
    }
2109
2109
 
2110
 
    net_clear(net, 1);                          /* Sets net->write_pos */
 
2110
    if (net->vio)
 
2111
      net_clear(net, 1);          /* Sets net->write_pos */
 
2112
    else
 
2113
    {
 
2114
      set_stmt_errmsg(stmt, net);
 
2115
      DBUG_RETURN(1);             
 
2116
    }
 
2117
 
2111
2118
    /* Reserve place for null-marker bytes */
2112
2119
    null_count= (stmt->param_count+7) /8;
2113
2120
    if (my_realloc_str(net, null_count + 1))