← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/include/hash0hash.ic

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20120222223355-or06x1euyk8n0ldi
Tags: 5.1.61-0ubuntu0.10.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
* Dropped patches unnecessary with 5.1.61:
  - debian/patches/90_mysql_safer_strmov.dpatch
  - debian/patches/51_ssl_test_certs.dpatch
  - debian/patches/52_CVE-2009-4030.dpatch
  - debian/patches/53_CVE-2009-4484.dpatch
  - debian/patches/54_CVE-2008-7247.dpatch
  - debian/patches/55_CVE-2010-1621.dpatch
  - debian/patches/56_CVE-2010-1850.dpatch
  - debian/patches/57_CVE-2010-1849.dpatch
  - debian/patches/58_CVE-2010-1848.dpatch
  - debian/patches/59_CVE-2010-1626.dpatch
  - debian/patches/60_CVE-2010-2008.dpatch
  - debian/patches/60_CVE-2010-3677.dpatch
  - debian/patches/60_CVE-2010-3678.dpatch
  - debian/patches/60_CVE-2010-3679.dpatch
  - debian/patches/60_CVE-2010-3680.dpatch
  - debian/patches/60_CVE-2010-3681.dpatch
  - debian/patches/60_CVE-2010-3682.dpatch
  - debian/patches/60_CVE-2010-3683.dpatch
  - debian/patches/60_CVE-2010-3833.dpatch
  - debian/patches/60_CVE-2010-3834.dpatch
  - debian/patches/60_CVE-2010-3835.dpatch
  - debian/patches/60_CVE-2010-3836.dpatch
  - debian/patches/60_CVE-2010-3837.dpatch
  - debian/patches/60_CVE-2010-3838.dpatch
  - debian/patches/60_CVE-2010-3839.dpatch
  - debian/patches/60_CVE-2010-3840.dpatch
  - debian/patches/61_disable_longfilename_test.dpatch
  - debian/patches/62_alter_table_fix.dpatch
  - debian/patches/63_cherrypick-upstream-49479.dpatch
  - debian/patches/10_readline_build_fix.dpatch
* debian/mysql-client-5.1.docs: removed EXCEPTIONS-CLIENT file
* debian/mysql-server-5.1.docs,debian/libmysqlclient16.docs,
  debian/libmysqlclient-dev.docs: removed, no longer necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innodb_plugin/include/hash0hash.ic
35
35
        hash_table_t*   table,  /*!< in: hash table */
36
36
        ulint           n)      /*!< in: cell index */
37
37
{
 
38
        ut_ad(table);
 
39
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
38
40
        ut_ad(n < table->n_cells);
39
41
 
40
42
        return(table->array + n);
48
50
/*=============*/
49
51
        hash_table_t*   table)  /*!< in/out: hash table */
50
52
{
 
53
        ut_ad(table);
 
54
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
51
55
        memset(table->array, 0x0,
52
56
               table->n_cells * sizeof(*table->array));
53
57
}
61
65
/*=============*/
62
66
        hash_table_t*   table)  /*!< in: table */
63
67
{
 
68
        ut_ad(table);
 
69
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
64
70
        return(table->n_cells);
65
71
}
66
72
 
74
80
        ulint           fold,   /*!< in: folded value */
75
81
        hash_table_t*   table)  /*!< in: hash table */
76
82
{
 
83
        ut_ad(table);
 
84
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
77
85
        return(ut_hash_ulint(fold, table->n_cells));
78
86
}
79
87
 
88
96
        hash_table_t*   table,  /*!< in: hash table */
89
97
        ulint           fold)   /*!< in: fold */
90
98
{
 
99
        ut_ad(table);
 
100
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
91
101
        ut_ad(ut_is_2pow(table->n_mutexes));
92
102
        return(ut_2pow_remainder(hash_calc_hash(fold, table),
93
103
                                 table->n_mutexes));
103
113
        hash_table_t*   table,  /*!< in: hash table */
104
114
        ulint           i)      /*!< in: index of the heap */
105
115
{
 
116
        ut_ad(table);
 
117
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
106
118
        ut_ad(i < table->n_mutexes);
107
119
 
108
120
        return(table->heaps[i]);
120
132
{
121
133
        ulint   i;
122
134
 
 
135
        ut_ad(table);
 
136
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
 
137
 
123
138
        if (table->heap) {
124
139
                return(table->heap);
125
140
        }
139
154
        hash_table_t*   table,  /*!< in: hash table */
140
155
        ulint           i)      /*!< in: index of the mutex */
141
156
{
 
157
        ut_ad(table);
 
158
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
142
159
        ut_ad(i < table->n_mutexes);
143
160
 
144
161
        return(table->mutexes + i);
156
173
{
157
174
        ulint   i;
158
175
 
 
176
        ut_ad(table);
 
177
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
 
178
 
159
179
        i = hash_get_mutex_no(table, fold);
160
180
 
161
181
        return(hash_get_nth_mutex(table, i));