Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2371 06/12/27 15:05:10 tomas@poseidon. +26 -0
Merge tulin@stripped:/home/bk/mysql-5.1-new-ndb
into poseidon.:/home/tomas/mysql-5.1-telco
storage/ndb/tools/restore/restore_main.cpp
1.52 06/12/27 15:04:53 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp
1.33 06/12/27 15:04:53 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/mgmsrv/Services.cpp
1.85 06/12/27 15:04:53 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp
1.53 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.116 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp
1.82 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp
1.83 06/12/27 15:04:52 tomas@poseidon. +0 -6
Auto merged
storage/ndb/src/kernel/main.cpp
1.63 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
1.44 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
1.43 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
1.40 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/common/util/version.c
1.27 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp
1.32 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
1.4 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
1.4 06/12/27 15:04:52 tomas@poseidon. +0 -1
Auto merged
storage/ndb/ndbapi-examples/Makefile
1.12 06/12/27 15:04:52 tomas@poseidon. +0 -1
Auto merged
storage/ndb/include/util/version.h
1.7 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/util/ndb_opts.h
1.21 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/mgmapi/mgmapi.h
1.61 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
1.6 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp
1.5 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
1.6 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/kernel/NodeInfo.hpp
1.7 06/12/27 15:04:52 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/ndb_version.h.in
1.14 06/12/27 15:04:51 tomas@poseidon. +0 -0
Auto merged
storage/ndb/include/debugger/EventLogger.hpp
1.14 06/12/27 15:04:51 tomas@poseidon. +0 -0
Auto merged
configure.in
1.410 06/12/27 15:04:51 tomas@poseidon. +0 -0
Auto merged
# 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: tomas
# Host: poseidon.
# Root: /home/tomas/mysql-5.1-telco/RESYNC
--- 1.409/configure.in 2006-12-26 21:33:19 +01:00
+++ 1.410/configure.in 2006-12-27 15:04:51 +01:00
@@ -7,8 +7,13 @@
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.14-ndb-6.1.0)
AM_CONFIG_HEADER(config.h)
+
+NDB_VERSION_MAJOR=6
+NDB_VERSION_MINOR=1
+NDB_VERSION_BUILD=0
+NDB_VERSION_STATUS="-beta"
PROTOCOL_VERSION=10
DOT_FRM_VERSION=6
--- 1.13/storage/ndb/include/ndb_version.h.in 2006-12-19 13:01:56 +01:00
+++ 1.14/storage/ndb/include/ndb_version.h.in 2006-12-27 15:04:51 +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.13/storage/ndb/include/debugger/EventLogger.hpp 2006-12-19 13:01:56 +01:00
+++ 1.14/storage/ndb/include/debugger/EventLogger.hpp 2006-12-27 15:04:51 +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.6/storage/ndb/include/kernel/NodeInfo.hpp 2006-12-19 13:01:56 +01:00
+++ 1.7/storage/ndb/include/kernel/NodeInfo.hpp 2006-12-27 15:04:52 +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.5/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp 2006-12-19 13:01:56 +01:00
+++ 1.6/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp 2006-12-27 15:04:52 +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/include/kernel/signaldata/ApiVersion.hpp 2006-12-19 13:01:56 +01:00
+++ 1.5/storage/ndb/include/kernel/signaldata/ApiVersion.hpp 2006-12-27 15:04:52 +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.5/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp 2006-12-19 13:01:56 +01:00
+++ 1.6/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp 2006-12-27 15:04:52 +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.60/storage/ndb/include/mgmapi/mgmapi.h 2006-12-19 13:01:56 +01:00
+++ 1.61/storage/ndb/include/mgmapi/mgmapi.h 2006-12-27 15:04:52 +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.6/storage/ndb/include/util/version.h 2006-12-19 13:01:57 +01:00
+++ 1.7/storage/ndb/include/util/version.h 2006-12-27 15:04:52 +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.31/storage/ndb/src/common/debugger/EventLogger.cpp 2006-12-19 13:01:57 +01:00
+++ 1.32/storage/ndb/src/common/debugger/EventLogger.cpp 2006-12-27 15:04:52 +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.26/storage/ndb/src/common/util/version.c 2006-12-19 13:01:57 +01:00
+++ 1.27/storage/ndb/src/common/util/version.c 2006-12-27 15:04:52 +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.51/storage/ndb/tools/restore/restore_main.cpp 2006-12-19 13:01:57 +01:00
+++ 1.52/storage/ndb/tools/restore/restore_main.cpp 2006-12-27 15:04:53 +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.39/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2006-12-19 14:23:29 +01:00
+++ 1.40/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2006-12-27 15:04:52 +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.42/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2006-12-19 13:01:57 +01:00
+++ 1.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2006-12-27 15:04:52 +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.43/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2006-12-19 13:01:57 +01:00
+++ 1.44/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2006-12-27 15:04:52 +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.62/storage/ndb/src/kernel/main.cpp 2006-12-19 14:23:29 +01:00
+++ 1.63/storage/ndb/src/kernel/main.cpp 2006-12-27 15:04:52 +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.82/storage/ndb/src/mgmapi/mgmapi.cpp 2006-12-19 13:54:45 +01:00
+++ 1.83/storage/ndb/src/mgmapi/mgmapi.cpp 2006-12-27 15:04:52 +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.81/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2006-12-19 13:54:45 +01:00
+++ 1.82/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2006-12-27 15:04:52 +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.115/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2006-12-19 14:23:29 +01:00
+++ 1.116/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2006-12-27 15:04:52 +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.52/storage/ndb/src/mgmsrv/MgmtSrvr.hpp 2006-12-19 14:23:29 +01:00
+++ 1.53/storage/ndb/src/mgmsrv/MgmtSrvr.hpp 2006-12-27 15:04:52 +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.84/storage/ndb/src/mgmsrv/Services.cpp 2006-12-19 14:23:29 +01:00
+++ 1.85/storage/ndb/src/mgmsrv/Services.cpp 2006-12-27 15:04:53 +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.32/storage/ndb/src/ndbapi/ClusterMgr.cpp 2006-12-19 13:01:57 +01:00
+++ 1.33/storage/ndb/src/ndbapi/ClusterMgr.cpp 2006-12-27 15:04:53 +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.20/storage/ndb/include/util/ndb_opts.h 2006-12-19 13:01:57 +01:00
+++ 1.21/storage/ndb/include/util/ndb_opts.h 2006-12-27 15:04:52 +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 (tomas:1.2371) | tomas | 27 Dec |
