List:Commits« Previous MessageNext Message »
From:kent Date:December 31 2006 12:05am
Subject:bk commit into 5.1 tree (kent:1.2370)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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@stripped, 2006-12-31 01:04:59+01:00, kent@kent-amd64.(none) +10 -0
  Merge kboortz@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/kent/bk/main/mysql-5.1
  MERGE: 1.2368.1.2

  sql/ha_ndbcluster_binlog.cc@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.90.1.1

  sql/sql_plugin.cc@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.39.1.1

  storage/ndb/include/kernel/signaldata/Extent.hpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.1

  storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.2

  storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Merge rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.18.1.1

  storage/ndb/src/kernel/blocks/diskpage.hpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.1

  storage/ndb/src/kernel/blocks/lgman.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.20.1.1

  storage/ndb/src/kernel/blocks/print_file.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.3.1.1

  storage/ndb/src/kernel/blocks/tsman.cpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.10.1.1

  storage/ndb/src/kernel/blocks/tsman.hpp@stripped, 2006-12-31 01:04:56+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.6.1.1

# 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:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/main/mysql-5.1/RESYNC

--- 1.3/storage/ndb/include/kernel/signaldata/Extent.hpp	2006-12-31 01:05:04 +01:00
+++ 1.4/storage/ndb/include/kernel/signaldata/Extent.hpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-12-31 01:05:04 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.3/storage/ndb/src/kernel/blocks/diskpage.hpp	2006-12-31 01:05:04 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/diskpage.hpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.22/storage/ndb/src/kernel/blocks/lgman.cpp	2006-12-31 01:05:04 +01:00
+++ 1.23/storage/ndb/src/kernel/blocks/lgman.cpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.4/storage/ndb/src/kernel/blocks/print_file.cpp	2006-12-31 01:05:04 +01:00
+++ 1.5/storage/ndb/src/kernel/blocks/print_file.cpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.12/storage/ndb/src/kernel/blocks/tsman.cpp	2006-12-31 01:05:04 +01:00
+++ 1.13/storage/ndb/src/kernel/blocks/tsman.cpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.7/storage/ndb/src/kernel/blocks/tsman.hpp	2006-12-31 01:05:04 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/tsman.hpp	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.40/sql/sql_plugin.cc	2006-12-31 01:05:04 +01:00
+++ 1.41/sql/sql_plugin.cc	2006-12-31 01:05:04 +01:00
@@ -982,7 +982,7 @@
     {
       rw_rdlock(&THR_LOCK_plugin);
       for (uint i=idx; i < total; i++)
-        if (plugins[i]->state & state_mask)
+        if (plugins[i] && plugins[i]->state & state_mask)
           plugins[i]=0;
       rw_unlock(&THR_LOCK_plugin);
     }

--- 1.94/sql/ha_ndbcluster_binlog.cc	2006-12-31 01:05:04 +01:00
+++ 1.95/sql/ha_ndbcluster_binlog.cc	2006-12-31 01:05:04 +01:00
@@ -2,8 +2,7 @@
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+  the Free Software Foundation; version 2 of the License.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
Thread
bk commit into 5.1 tree (kent:1.2370)kent31 Dec