← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/ha_ndbcluster.cc

  • 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:
sql/ha_ndbcluster.cc
1
 
/* Copyright (C) 2000-2003 MySQL AB
 
1
/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
  This program is free software; you can redistribute it and/or modify
4
4
  it under the terms of the GNU General Public License as published by
11
11
 
12
12
  You should have received a copy of the GNU General Public License
13
13
  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
 
*/
 
14
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
16
15
 
17
16
/**
18
17
  @file
1293
1292
  for (i= 0; i < tab->s->keys; i++, key_info++, key_name++)
1294
1293
  {
1295
1294
    if ((error= add_index_handle(thd, dict, key_info, *key_name, i)))
 
1295
    {
1296
1296
      if (ignore_error)
1297
1297
        m_index[i].index= m_index[i].unique_index= NULL;
1298
1298
      else
1299
1299
        break;
 
1300
    }
1300
1301
    m_index[i].null_in_unique_index= FALSE;
1301
1302
    if (check_index_fields_not_null(key_info))
1302
1303
      m_index[i].null_in_unique_index= TRUE;
6265
6266
  for (;;)
6266
6267
  {
6267
6268
    Ndb_tuple_id_range_guard g(m_share);
6268
 
    if (m_skip_auto_increment &&
6269
 
        ndb->readAutoIncrementValue(m_table, g.range, auto_value) ||
 
6269
    if ((m_skip_auto_increment &&
 
6270
        ndb->readAutoIncrementValue(m_table, g.range, auto_value)) ||
6270
6271
        ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset))
6271
6272
    {
6272
6273
      if (--retries &&
7316
7317
  if (ndbcluster_inited)
7317
7318
    DBUG_RETURN(FALSE);
7318
7319
 
7319
 
  /*
7320
 
    Below we create new THD's. They'll need LOCK_plugin, but it's taken now by
7321
 
    plugin initialization code. Release it to avoid deadlocks.  It's safe, as
7322
 
    there're no threads that may concurrently access plugin control structures.
7323
 
  */
7324
 
  pthread_mutex_unlock(&LOCK_plugin);
7325
 
 
7326
7320
  pthread_mutex_init(&ndbcluster_mutex,MY_MUTEX_INIT_FAST);
7327
7321
  pthread_mutex_init(&LOCK_ndb_util_thread, MY_MUTEX_INIT_FAST);
7328
7322
  pthread_cond_init(&COND_ndb_util_thread, NULL);
7463
7457
    goto ndbcluster_init_error;
7464
7458
  }
7465
7459
 
7466
 
  pthread_mutex_lock(&LOCK_plugin);
7467
 
 
7468
7460
  ndbcluster_inited= 1;
7469
7461
  DBUG_RETURN(FALSE);
7470
7462
 
7477
7469
  g_ndb_cluster_connection= NULL;
7478
7470
  ndbcluster_hton->state= SHOW_OPTION_DISABLED;               // If we couldn't use handler
7479
7471
 
7480
 
  pthread_mutex_lock(&LOCK_plugin);
7481
 
 
7482
7472
  DBUG_RETURN(TRUE);
7483
7473
}
7484
7474
 
8420
8410
      DBUG_PRINT("error", ("get_share: failed to alloc share"));
8421
8411
      if (!have_lock)
8422
8412
        pthread_mutex_unlock(&ndbcluster_mutex);
8423
 
      my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*share));
 
8413
      my_error(ER_OUTOFMEMORY, MYF(0), static_cast<int>(sizeof(*share)));
8424
8414
      DBUG_RETURN(0);
8425
8415
    }
8426
8416
  }
9927
9917
  {
9928
9918
    Field *field= table->field[i];
9929
9919
    const NDBCOL *col= tab->getColumn(i);
9930
 
    if (col->getStorageType() == NDB_STORAGETYPE_MEMORY && create_info->storage_media != HA_SM_MEMORY ||
9931
 
        col->getStorageType() == NDB_STORAGETYPE_DISK && create_info->storage_media != HA_SM_DISK)
 
9920
    if ((col->getStorageType() == NDB_STORAGETYPE_MEMORY && create_info->storage_media != HA_SM_MEMORY) ||
 
9921
        (col->getStorageType() == NDB_STORAGETYPE_DISK && create_info->storage_media != HA_SM_DISK))
9932
9922
    {
9933
9923
      DBUG_PRINT("info", ("Column storage media is changed"));
9934
9924
      DBUG_RETURN(COMPATIBLE_DATA_NO);