From: Date: September 2 2008 11:30am
Subject: bzr push into mysql-5.1 branch (msvensson:2680 to 2682) Bug#39158
List-Archive: http://lists.mysql.com/commits/53117
X-Bug: 39158
Message-Id: <20080902093003.C91BB30E864@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2682 Magnus Svensson	2008-09-02 [merge]
      Merge bug#39158
modified:
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp

 2681 Magnus Svensson	2008-09-02 [merge]
      Merge bug#31315
modified:
  scripts/mysql_install_db.sh

 2680 Jonas Oreland	2008-08-30 [merge]
      merge 6.2 to 6.3
modified:
  storage/ndb/test/run-test/atrt-backtrace.sh
  storage/ndb/test/run-test/daily-devel-tests.txt

=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2007-12-13 02:14:28 +0000
+++ b/scripts/mysql_install_db.sh	2008-09-02 08:53:30 +0000
@@ -339,6 +339,7 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$my
 mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
   --basedir=$basedir --datadir=$ldata --log-warnings=0 --loose-skip-innodb \
   --loose-skip-ndbcluster $args --max_allowed_packet=8M \
+  --default-storage-engine=myisam \
   --net_buffer_length=16K"
 
 # Create the system and help tables by passing them to "mysqld --bootstrap"

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-08-21 22:14:40 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-09-02 09:28:24 +0000
@@ -2339,6 +2339,7 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
 			  "or specifying unique host names in config file,\n"
 			  "or specifying just one mgmt server in config file.",
 			  tmp);
+      NdbMutex_Unlock(m_configMutex);
       error_code = NDB_MGM_ALLOCID_CONFIG_MISMATCH;
       DBUG_RETURN(false);
     }