[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.1 tree (ndbdev:1.1917)
From:       jonas () mysql ! com
Date:       2005-06-30 20:07:01
Message-ID: 200506302007.j5UK71tA023354 () dl145a ! mysql ! com
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1917 05/06/30 22:06:57 ndbdev@dl145a.mysql.com +3 -0
  ndb diskdata - fix compile errors

  BitKeeper/etc/logging_ok
    1.301 05/06/30 22:06:56 ndbdev@dl145a.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.24 05/06/30 22:06:00 ndbdev@dl145a.mysql.com +1 -1
    Fix compile error

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.43 05/06/30 22:05:49 ndbdev@dl145a.mysql.com +1 -1
    Fix compile error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ndbdev
# Host:	dl145a.mysql.com
# Root:	/data0/autotest-build/clone-mysql-5.1-ndb-dd-2005-06-30

--- 1.300/BitKeeper/etc/logging_ok	Mon Jun 13 15:24:10 2005
+++ 1.301/BitKeeper/etc/logging_ok	Thu Jun 30 22:06:56 2005
@@ -201,6 +201,7 @@
 mysqldev@melody.local
 mysqldev@mysql.com
 mysqldev@o2k.irixworld.net
+ndbdev@dl145a.mysql.com
 ndbdev@dl145b.mysql.com
 ndbdev@dl145c.mysql.com
 ndbdev@eel.hemma.oreland.se

--- 1.23/storage/ndb/src/kernel/blocks/pgman.cpp	Sun Jun 12 16:03:07 2005
+++ 1.24/storage/ndb/src/kernel/blocks/pgman.cpp	Thu Jun 30 22:06:00 2005
@@ -574,7 +574,7 @@
 bool
 Pgman::find_page_entry(Ptr<Page_entry>& ptr, Uint32 file_no, Uint32 page_no)
 {
-  static Page_entry key(ZNIL, 0);
+  Page_entry key(ZNIL, 0);
   key.m_file_no = file_no;
   key.m_page_no = page_no;
 

--- 1.42/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	Wed Jun 15 19:06:39 2005
+++ 1.43/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	Thu Jun 30 22:05:49 2005
@@ -613,7 +613,7 @@
     len = 1 + *((Uint8*)value);
     break;
   case NDB_ARRAYTYPE_MEDIUM_VAR:
-    len = 2 + uint2korr(value);
+    len = 2 + uint2korr((char*)value);
     break;
   default:
     len = max_len;

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]