diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
| commit | b7b25dc666a8d331d16231f9fb658af8c05ac694 (patch) | |
| tree | 0c7798c2d187db0da7837a70f306a789afc16521 /sql/ha_ndbcluster.cc | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| download | mariadb-git-b7b25dc666a8d331d16231f9fb658af8c05ac694.tar.gz | |
Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'
Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 7fd37143205..a70e5aff996 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6269,8 +6269,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment, Ndb_tuple_id_range_guard g(m_share); if ((m_skip_auto_increment && ndb->readAutoIncrementValue(m_table, g.range, auto_value)) || - ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, - increment, offset)) + ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset)) { if (--retries && ndb->getNdbError().status == NdbError::TemporaryError) @@ -9922,10 +9921,8 @@ bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *create_info, { Field *field= table->field[i]; const NDBCOL *col= tab->getColumn(i); - if ((col->getStorageType() == NDB_STORAGETYPE_MEMORY && - create_info->storage_media != HA_SM_MEMORY) || - (col->getStorageType() == NDB_STORAGETYPE_DISK && - create_info->storage_media != HA_SM_DISK)) + if ((col->getStorageType() == NDB_STORAGETYPE_MEMORY && create_info->storage_media != HA_SM_MEMORY) || + (col->getStorageType() == NDB_STORAGETYPE_DISK && create_info->storage_media != HA_SM_DISK)) { DBUG_PRINT("info", ("Column storage media is changed")); DBUG_RETURN(COMPATIBLE_DATA_NO); |