List:Commits« Previous MessageNext Message »
From:Kent Boortz Date:October 4 2012 1:29pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (kent.boortz:3979 to 3980)
View as plain text  
 3980 kent.boortz@stripped	2012-10-04
      applying patch for br14699367

    modified:
      VERSION
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/error/ErrorReporter.cpp
 3979 Kent Boortz	2012-09-28
      Use the same version string when building and installing JAR files

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
=== modified file 'VERSION'
--- a/VERSION	2012-09-27 11:15:21 +0000
+++ b/VERSION	2012-10-04 13:24:14 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=27
-MYSQL_VERSION_EXTRA=-ndb-7.2.8-br1
+MYSQL_VERSION_EXTRA=-ndb-7.2.8-br2

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2012-09-27 11:15:21 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2012-10-04 13:24:14 +0000
@@ -6214,7 +6214,7 @@ loop:
   if(!c_page_chunk_pool.seize(ptr))
     return RNIL;
 
-  Uint32 count = 16;
+  Uint32 count = 192;
   m_ctx.m_mm.alloc_pages(RT_DBTUP_PAGE, &ref, &count, 1);
   if (count == 0)
     return RNIL;

=== modified file 'storage/ndb/src/kernel/error/ErrorReporter.cpp'
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp	2012-01-19 12:28:47 +0000
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp	2012-10-04 13:24:14 +0000
@@ -49,6 +49,9 @@ static
 const char *
 ndb_basename(const char * path)
 {
+  if (path == NULL)
+    return NULL;
+
   const char separator = '/';
   const char * p = path + strlen(path);
   while (p > path && p[0] != separator)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (kent.boortz:3979 to 3980) Kent Boortz4 Oct