← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/innobase/dict/dict0dict.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/innobase/dict/dict0dict.c
1358
1358
                        new_index->heap,
1359
1359
                        (1 + dict_index_get_n_unique(new_index))
1360
1360
                        * sizeof(ib_longlong));
 
1361
 
 
1362
                new_index->stat_n_non_null_key_vals = mem_heap_zalloc(
 
1363
                        new_index->heap,
 
1364
                        (1 + dict_index_get_n_unique(new_index))
 
1365
                        * sizeof(*new_index->stat_n_non_null_key_vals));
 
1366
 
1361
1367
                /* Give some sensible values to stat_n_... in case we do
1362
1368
                not calculate statistics quickly enough */
1363
1369
 
2217
2223
                        quote = '\0';
2218
2224
                } else if (quote) {
2219
2225
                        /* Within quotes: do nothing. */
2220
 
                } else if (*ptr == '`' || *ptr == '"') {
 
2226
                } else if (*ptr == '`' || *ptr == '"' || *ptr == '\'') {
2221
2227
                        /* Starting quote: remember the quote character. */
2222
2228
                        quote = *ptr;
2223
2229
                } else {
3817
3823
                        for (i = dict_index_get_n_unique(index); i; ) {
3818
3824
                                index->stat_n_diff_key_vals[i--] = 1;
3819
3825
                        }
 
3826
 
 
3827
                        memset(index->stat_n_non_null_key_vals, 0,
 
3828
                               (1 + dict_index_get_n_unique(index))
 
3829
                               * sizeof(*index->stat_n_non_null_key_vals));
3820
3830
                }
3821
3831
 
3822
3832
                index = dict_table_get_next_index(index);