From: magnus.blaudd Date: November 12 2012 2:39pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4080 to 4084) List-Archive: http://lists.mysql.com/commits/145272 Message-Id: <20121112143925.7751.83196.4084@wholphin> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4084 magnus.blaudd@stripped 2012-11-12 [merge] Merge 7.1 -> 7.2 modified: storage/ndb/compile-cluster storage/ndb/src/mgmsrv/testConfig.cpp 4083 magnus.blaudd@stripped 2012-11-12 ndb - fix warning about missing newline at end of memcache/include/int3korr.h(it was just a tab) modified: storage/ndb/memcache/include/int3korr.h 4082 magnus.blaudd@stripped 2012-11-12 [merge] Merge 7.1 -> 7.2 4081 magnus.blaudd@stripped 2012-11-12 [merge] Merge modified: sql/ha_ndbcluster.cc sql/ha_ndbcluster_glue.h 4080 magnus.blaudd@stripped 2012-11-12 [merge] Merge modified: storage/ndb/cmake/os/Windows.cmake storage/ndb/compile-cluster storage/ndb/test/ndbapi/testInterpreter.cpp === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2012-11-06 10:38:28 +0000 +++ b/sql/ha_ndbcluster.cc 2012-11-12 13:08:21 +0000 @@ -8972,8 +8972,7 @@ static int create_ndb_column(THD *thd, } else col.setAutoIncrement(FALSE); - -#ifndef NDB_WITHOUT_COLUMN_FORMAT + DBUG_PRINT("info", ("storage: %u format: %u ", field->field_storage_type(), field->column_format())); @@ -9008,7 +9007,6 @@ static int create_ndb_column(THD *thd, dynamic= (create_info->row_type == ROW_TYPE_DYNAMIC); break; } -#endif DBUG_PRINT("info", ("Column %s is declared %s", field->field_name, (dynamic) ? "dynamic" : "static")); if (type == NDBCOL::StorageTypeDisk) @@ -9020,7 +9018,6 @@ static int create_ndb_column(THD *thd, dynamic= false; } -#ifndef NDB_WITHOUT_COLUMN_FORMAT if (thd && field->column_format() == COLUMN_FORMAT_TYPE_DYNAMIC) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, @@ -9030,7 +9027,6 @@ static int create_ndb_column(THD *thd, "column will become FIXED", field->field_name); } -#endif } switch (create_info->row_type) { @@ -9527,7 +9523,6 @@ int ha_ndbcluster::create(const char *na KEY_PART_INFO *end= key_part + key_info->key_parts; for (; key_part != end; key_part++) { -#ifndef NDB_WITHOUT_COLUMN_FORMAT if (key_part->field->field_storage_type() == HA_SM_DISK) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, @@ -9540,7 +9535,6 @@ int ha_ndbcluster::create(const char *na result= HA_ERR_UNSUPPORTED; goto abort_return; } -#endif tab.getColumn(key_part->fieldnr-1)->setStorageType( NdbDictionary::Column::StorageTypeMemory); } @@ -9980,7 +9974,6 @@ int ha_ndbcluster::create_ndb_index(THD for (; key_part != end; key_part++) { Field *field= key_part->field; -#ifndef NDB_WITHOUT_COLUMN_FORMAT if (field->field_storage_type() == HA_SM_DISK) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, @@ -9992,7 +9985,6 @@ int ha_ndbcluster::create_ndb_index(THD "STORAGE DISK is not supported"); DBUG_RETURN(HA_ERR_UNSUPPORTED); } -#endif DBUG_PRINT("info", ("attr: %s", field->field_name)); if (ndb_index.addColumnName(field->field_name)) { === modified file 'sql/ha_ndbcluster_glue.h' --- a/sql/ha_ndbcluster_glue.h 2011-10-29 09:18:21 +0000 +++ b/sql/ha_ndbcluster_glue.h 2012-11-12 13:08:21 +0000 @@ -77,19 +77,12 @@ bool close_cached_tables(THD *thd, TABLE #endif - -extern ulong opt_server_id_mask; - static inline uint32 thd_unmasked_server_id(const THD* thd) { -#ifndef NDB_WITHOUT_SERVER_ID_BITS const uint32 unmasked_server_id = thd->unmasked_server_id; assert(thd->server_id == (thd->unmasked_server_id & opt_server_id_mask)); return unmasked_server_id; -#else - return thd->server_id; -#endif } === modified file 'storage/ndb/compile-cluster' --- a/storage/ndb/compile-cluster 2012-11-12 12:21:47 +0000 +++ b/storage/ndb/compile-cluster 2012-11-12 14:36:27 +0000 @@ -426,6 +426,7 @@ sub build_cmd { # package WarningParser::Warning; use strict; +use Cwd 'abs_path'; sub new { my ($class, $file, $line, $text)= @_; @@ -543,11 +544,14 @@ sub new_warning { # file does not contain directory, add currently # tracked dir my $dir = $self->{DIR}; - my $srcdir = $self->{SRCDIR}; - $dir =~ s/^$srcdir//; # Remove leading srcdir - $dir =~ s:^\/::; # Remove leading slash $file= "$dir/$file"; } + my $srcdir = $self->{SRCDIR}; + # srcdir is in abs_path form, convert also file to abs_path + $file = abs_path($file); + $file =~ s/^$srcdir//; # Remove leading srcdir + $file =~ s:^\/::; # Remove leading slash + return WarningParser::Warning->new($file, $line, $text); } === modified file 'storage/ndb/memcache/include/int3korr.h' --- a/storage/ndb/memcache/include/int3korr.h 2011-11-07 18:47:48 +0000 +++ b/storage/ndb/memcache/include/int3korr.h 2012-11-12 13:53:54 +0000 @@ -30,4 +30,4 @@ #define uint3korr(A) (Uint32) (((Uint32) ((Uint8) (A)[0])) +\ (((Uint32) ((Uint8) (A)[1])) << 8) +\ (((Uint32) ((Uint8) (A)[2])) << 16)) - \ No newline at end of file + === modified file 'storage/ndb/src/mgmsrv/testConfig.cpp' --- a/storage/ndb/src/mgmsrv/testConfig.cpp 2011-02-02 00:40:07 +0000 +++ b/storage/ndb/src/mgmsrv/testConfig.cpp 2012-11-12 13:42:48 +0000 @@ -302,19 +302,19 @@ print_restart_info(void) } fprintf(stderr, "*** initial node restart ***\n"); - for (size_t i = 0; i < initial_node.size(); i++) { + for (unsigned i = 0; i < initial_node.size(); i++) { fprintf(stderr, "%s\n", initial_node[i]); } fprintf(stderr, "\n"); fprintf(stderr, "*** system restart ***\n"); - for (size_t i = 0; i < system.size(); i++) { + for (unsigned i = 0; i < system.size(); i++) { fprintf(stderr, "%s\n", system[i]); } fprintf(stderr, "\n"); fprintf(stderr, "*** initial system restart ***\n"); - for (size_t i = 0; i < initial_system.size(); i++) { + for (unsigned i = 0; i < initial_system.size(); i++) { fprintf(stderr, "%s\n", initial_system[i]); } fprintf(stderr, "\n"); No bundle (reason: useless for push emails).