← Back to branch summary

~ubuntu-branches/ubuntu/hardy/mysql-dfsg-5.0/hardy-proposed

« back to all changes in this revision

Viewing changes to libmysqld/sp_pcontext.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-23 11:21:11 UTC
  • mfrom: (1.1.16) (38.1.4 hardy-security)
  • Revision ID: package-import@ubuntu.com-20120223112111-rn9ruzg86juli2ec
Tags: 5.0.95-0ubuntu1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.0.95 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2012-0075
  - CVE-2012-0087
  - CVE-2012-0101
  - CVE-2012-0102
  - CVE-2012-0114
  - CVE-2012-0484
  - CVE-2012-0490
* Dropped patches unnecessary with 5.0.95:
  - debian/patches/91_SECURITY_CVE-2007-5925.dpatch
  - debian/patches/95_SECURITY_CVE-2008-3963.dpatch
  - debian/patches/96_SECURITY_CVE-2008-4098.dpatch
  - debian/patches/97_CVE-2008-4456.dpatch
  - debian/patches/97_CVE-2009-2446.dpatch
  - debian/patches/97_CVE-2009-4019.dpatch
  - debian/patches/97_CVE-2009-4030.dpatch
  - debian/patches/98_CVE-2009-4484.dpatch
  - debian/patches/99_ssl_test_certs.dpatch
  - debian/patches/100_CVE-2010-1850.dpatch
  - debian/patches/101_CVE-2010-1849.dpatch
  - debian/patches/102_CVE-2010-1848.dpatch
  - debian/patches/103_CVE-2010-1626.dpatch
  - debian/patches/98_CVE-2010-3677.dpatch
  - debian/patches/98_CVE-2010-3680.dpatch
  - debian/patches/98_CVE-2010-3681.dpatch
  - debian/patches/98_CVE-2010-3682.dpatch
  - debian/patches/98_CVE-2010-3833.dpatch
  - debian/patches/98_CVE-2010-3834.dpatch
  - debian/patches/98_CVE-2010-3835.dpatch
  - debian/patches/98_CVE-2010-3836.dpatch
  - debian/patches/98_CVE-2010-3837.dpatch
  - debian/patches/98_CVE-2010-3838.dpatch
  - debian/patches/98_CVE-2010-3840.dpatch
  - debian/patches/45_warn-CLI-passwords.dpatch
  - debian/patches/50_fix_mysqldump.dpatch
  - debian/patches/51_incorrect-order.dpatch
  - debian/patches/52_ndb-gcc-4.2.dpatch
  - debian/patches/53_integer-gcc-4.2.dpatch
  - debian/patches/54_ssl-client-support.dpatch
  - debian/patches/55_testsuite-2008.dpatch
  - debian/patches/58-disable-ndb-backup-print.dpatch
  - debian/patches/59-fix-mysql-replication-logs.dpatch
  - debian/patches/86_PATH_MAX.dpatch
  - debian/patches/90_upstreamdebiandir.dpatch
  - debian/patches/92_fix_order_by32202.dpatch
  - debian/patches/93_fix_user_setup_on_localhost.dpatch
  - debian/patches/94_fix_mysqldump_with_old_versions.dpatch
  - debian/patches/56-mysqlhotcopy-invalid-dbtable.dpatch
  - debian/patches/57-fix-mysqlslowdump-config.dpatch
* debian/mysql-client-5.0.docs, debian/mysql-server-5.0.docs: removed
  EXCEPTIONS-CLIENT file
* debian/libmysqlclient15-dev.docs, debian/libmysqlclient15off.docs:
  removed, no longer necessary.
* debian/patches/25_mysys__default.c.dpatch: updated for 5.0.95.
* debian/mysql-server-5.0.files: change ndb_mgmd and ndbd manpage
  locations. Removed mysqlmanagerc.1 and mysqlmanager-pwgen.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysqld/sp_pcontext.cc
1
 
/* Copyright (C) 2002 MySQL AB
 
1
/* Copyright (c) 2002-2007 MySQL AB, 2008 Sun Microsystems, Inc.
 
2
   Use is subject to license terms.
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
11
12
 
12
13
   You should have received a copy of the GNU General Public License
13
14
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
15
16
 
16
17
#include "mysql_priv.h"
17
18
#ifdef USE_PRAGMA_IMPLEMENTATION
263
264
  p->mode= mode;
264
265
  p->offset= current_var_count();
265
266
  p->dflt= NULL;
266
 
  insert_dynamic(&m_vars, (gptr)&p);
 
267
  if (insert_dynamic(&m_vars, (gptr)&p))
 
268
    return NULL;
267
269
 
268
270
  return p;
269
271
}
308
310
  return NULL;
309
311
}
310
312
 
311
 
void
 
313
int
312
314
sp_pcontext::push_cond(LEX_STRING *name, sp_cond_type_t *val)
313
315
{
314
316
  sp_cond_t *p= (sp_cond_t *)sql_alloc(sizeof(sp_cond_t));
315
317
 
316
 
  if (p)
317
 
  {
318
 
    p->name.str= name->str;
319
 
    p->name.length= name->length;
320
 
    p->val= val;
321
 
    insert_dynamic(&m_conds, (gptr)&p);
322
 
  }
 
318
  if (p == NULL)
 
319
    return 1;
 
320
  p->name.str= name->str;
 
321
  p->name.length= name->length;
 
322
  p->val= val;
 
323
  return insert_dynamic(&m_conds, (gptr)&p);
323
324
}
324
325
 
325
326
/*
382
383
  return FALSE;
383
384
}
384
385
 
385
 
void
 
386
int
386
387
sp_pcontext::push_cursor(LEX_STRING *name)
387
388
{
388
389
  LEX_STRING n;
391
392
    m_max_cursor_index+= 1;
392
393
  n.str= name->str;
393
394
  n.length= name->length;
394
 
  insert_dynamic(&m_cursors, (gptr)&n);
 
395
  return insert_dynamic(&m_cursors, (gptr)&n);
395
396
}
396
397
 
397
398
/*