← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/heap/hp_open.c

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
http://bugs.debian.org/745330
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_open.c
30
30
  HP_INFO *info;
31
31
  DBUG_ENTER("heap_open_from_share");
32
32
 
33
 
  if (!(info= (HP_INFO*) my_malloc((uint) sizeof(HP_INFO) +
 
33
  if (!(info= (HP_INFO*) my_malloc(sizeof(HP_INFO) +
34
34
                                  2 * share->max_key_length,
35
35
                                  MYF(MY_ZEROFILL))))
36
36
  {
47
47
#ifndef DBUG_OFF
48
48
  info->opt_flag= READ_CHECK_USED;              /* Check when changing */
49
49
#endif
50
 
  DBUG_PRINT("exit",("heap: 0x%lx  reclength: %d  records_in_block: %d",
 
50
  DBUG_PRINT("exit",("heap: 0x%lx  reclength: %d  records_in_block: %lu",
51
51
                     (long) info, share->reclength,
52
52
                     share->block.records_in_block));
53
53
  DBUG_RETURN(info);