Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.1900 05/09/06 10:30:29 msvensson@neptunus.(none) +14 -0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
storage/ndb/tools/restore/restore_main.cpp
1.35 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp
1.19 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/tools/ndb_condig.cpp
1.9 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/tools/Makefile.am
1.23 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/mgmsrv/Services.cpp
1.51 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.80 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp
1.68 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp
1.9 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp
1.19 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp
1.14 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
1.20 05/09/06 10:30:20 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/mgmsrv/Services.cpp
1.45.4.3 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/mgmsrv/Services.cpp -> storage/ndb/src/mgmsrv/Services.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.73.5.3 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/mgmsrv/MgmtSrvr.cpp -> storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/mgmsrv/ConfigInfo.cpp
1.60.5.3 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/mgmsrv/ConfigInfo.cpp -> storage/ndb/src/mgmsrv/ConfigInfo.cpp
storage/ndb/src/kernel/vm/Emulator.hpp
1.6.1.3 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/kernel/vm/Emulator.hpp -> storage/ndb/src/kernel/vm/Emulator.hpp
storage/ndb/src/kernel/vm/Emulator.cpp
1.15.1.4 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/kernel/vm/Emulator.cpp -> storage/ndb/src/kernel/vm/Emulator.cpp
storage/ndb/src/kernel/main.cpp
1.54 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/include/util/ndb_opts.h
1.15 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Auto merged
client/mysqltest.c
1.156 05/09/06 10:30:17 msvensson@neptunus.(none) +0 -0
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp
1.8.6.3 05/09/06 10:30:16 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/kernel/error/ErrorReporter.cpp -> storage/ndb/src/kernel/error/ErrorReporter.cpp
storage/ndb/tools/restore/restore_main.cpp
1.29.5.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/tools/restore/restore_main.cpp -> storage/ndb/tools/restore/restore_main.cpp
storage/ndb/tools/restore/consumer_restore.cpp
1.14.5.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/tools/restore/consumer_restore.cpp -> storage/ndb/tools/restore/consumer_restore.cpp
storage/ndb/tools/ndb_condig.cpp
1.4.2.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/tools/ndb_config.cpp -> storage/ndb/tools/ndb_condig.cpp
storage/ndb/tools/Makefile.am
1.14.5.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/tools/Makefile.am -> storage/ndb/tools/Makefile.am
storage/ndb/src/kernel/main.cpp
1.48.3.4 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/kernel/main.cpp -> storage/ndb/src/kernel/main.cpp
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
1.14.3.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp -> storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
storage/ndb/include/util/ndb_opts.h
1.10.3.3 05/09/06 10:30:15 msvensson@neptunus.(none) +0 -0
Merge rename: ndb/include/util/ndb_opts.h -> storage/ndb/include/util/ndb_opts.h
# 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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.1/RESYNC
--- 1.14.5.2/ndb/tools/Makefile.am 2005-09-06 09:41:56 +02:00
+++ 1.23/storage/ndb/tools/Makefile.am 2005-09-06 10:30:20 +02:00
@@ -33,19 +33,19 @@
restore/Restore.cpp \
../test/src/NDBT_ResultRow.cpp $(tools_common_sources)
-ndb_config_SOURCES = ndb_config.cpp \
+ndb_config_SOURCES = ndb_condig.cpp \
../src/mgmsrv/Config.cpp \
../src/mgmsrv/ConfigInfo.cpp \
../src/mgmsrv/InitConfigFileParser.cpp
-ndb_config_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
- -I$(top_srcdir)/ndb/src/mgmsrv \
- -I$(top_srcdir)/ndb/include/mgmcommon \
+ndb_config_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi \
+ -I$(top_srcdir)/storage/ndb/src/mgmsrv \
+ -I$(top_srcdir)/storage/ndb/include/mgmcommon \
-DMYSQLCLUSTERDIR="\"\""
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
@@ -73,97 +73,97 @@
ndb_select_count.dsp
ndb_waiter.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_waiter
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_waiter
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_drop_table.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_drop_table
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_table
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_delete_all.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_delete_all
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_delete_all
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_desc.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_desc
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_desc
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_drop_index.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_drop_index
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_index
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_show_tables.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_show_tables
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_show_tables
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_select_all.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_select_all
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_all
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_select_count.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ ndb_select_count
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_count
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.1900) | msvensson | 6 Sep |
