← Back to branch summary

~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/trx/trx0i_s.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innodb_plugin/trx/trx0i_s.c
435
435
                /* record lock */
436
436
                ut_ad(!strcmp("RECORD", row->lock_type));
437
437
                ut_ad(row->lock_index != NULL);
438
 
                ut_ad(row->lock_data != NULL);
 
438
                /* row->lock_data == NULL if buf_page_try_get() == NULL */
439
439
                ut_ad(row->lock_page != ULINT_UNDEFINED);
440
440
                ut_ad(row->lock_rec != ULINT_UNDEFINED);
441
441
        }
498
498
        stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
499
499
 
500
500
        if (stmt != NULL) {
501
 
 
502
501
                char    query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];
503
502
 
504
503
                if (stmt_len > TRX_I_S_TRX_QUERY_MAX_LEN) {
509
508
                query[stmt_len] = '\0';
510
509
 
511
510
                row->trx_query = ha_storage_put_memlim(
512
 
                        cache->storage, stmt, stmt_len + 1,
 
511
                        cache->storage, query, stmt_len + 1,
513
512
                        MAX_ALLOWED_FOR_STORAGE(cache));
514
513
 
 
514
                row->trx_query_cs = innobase_get_charset(trx->mysql_thd);
 
515
 
515
516
                if (row->trx_query == NULL) {
516
517
 
517
518
                        return(FALSE);