into debian.(none):/MySQL/M51/indent-5.1
Manual merge of a formatting change.
Makefile.am:
Manual merge of the formatting change in 5.0,
the test actions differ so much that automerge doesn't work.
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
Makefile.am:
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
Reason:
For release builds, we run the tests in a tree that contains just a binary installation.
So the Makefile is not in the test tree, and we explicitly address it in the build tree.
This explicit path is not kept by "make", so it is missing in the sub-make.
There seems to be no way to solve this with (portable!) "make" features -
we could add a new variable and use it in the sub-make, but it is easier to duplicate these few lines.
Fix is to remove any references to the current hostname when running
mysql_install_db --cross-bootstrap. (The dist-hook make target makes
this call, and the resulting data directory is included in the source
distribution as win/data/*.)
Also, a few other clean-ups to mysql_install_db while there.
Makefile.am:
Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap)
scripts/mysql_install_db.sh:
Filter out references to the current hostname when performing
a cross-bootstrap installation by removing any lines which
contain the string "@current_hostname".
Deprecate the old --windows option; use --cross-bootstrap
instead, since it more accurately reflects the purpose.
Other clean-up: the wrong syntax was being used to test the
exit status of mysqld --bootstrap. It mostly worked, as long
as mysqld succeeded. However, it was not robust.
scripts/mysql_system_tables_data.sql:
Rename local @hostname variable to @current_hostname, which is a more
unique label to search on. mysql_install_db now filters out all
lines which include "@current_hostname" during a --cross-bootstrap
installation.
1) Add a new top level "Makefile.am" target "make embedded-test".
2) Fix a syntax error (bad merge) in "netware/Makefile.am".
Makefile.am:
Add a new "make" target "embedded-test" so that it is easier
to test the "embedded server" ("libmyslqd").
Make it "phony".
Use it via a sub-make within "test-bt" to avoid code duplication.
netware/Makefile.am:
Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog:
Auto merged
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-rules:
Auto merged
Makefile.am:
Merged in removal of debian dir from 5.0-maint
Handle pstack like other optional directories
Check if a directory exists relative to $srcdir
Makefile.am:
Handle pstack like other optional directories
Check if a directory exists relative to $srcdir
configure.in:
Handle pstack like other optional directories
Check if a directory exists relative to $srcdir
pstack/Makefile.am:
Handle pstack like other optional directories
Check if a directory exists relative to $srcdir
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Use most current version of test results.
Always include all sub directories in "make dist"
Removed incorrect comment
configure.in:
Unconditionally list make files in AC_CONFIG_FILES
Removed 'thread_dirs', it is not used
Minor cleanup
compile-dist:
Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
Removed DIST_SUBDIRS not needed
Don't copy soft links as files into source package
BUILD/compile-dist:
Simplified the configure line needed for "make dist" to get it all
config/ac-macros/ssl.m4:
Unconditionally list make files in AC_CONFIG_FILES
config/ac-macros/zlib.m4:
Unconditionally list make files in AC_CONFIG_FILES
libmysql/Makefile.am:
Removed incorrect comment
Makefile.am:
Always include all sub directories in "make dist"
mysql-test/Makefile.am:
Removed DIST_SUBDIRS not needed
libmysql_r/Makefile.am:
Don't copy soft links as files into source package
libmysqld/Makefile.am:
Don't copy soft links as files into source package
libmysqld/examples/Makefile.am:
Don't copy soft links as files into source package
sql/Makefile.am:
Don't copy soft links as files into source package
extra/Makefile.am:
Always include all sub directories in "make dist"
plugin/Makefile.am:
Always include all sub directories in "make dist"
configure.in:
Unconditionally list make files in AC_CONFIG_FILES
Removed 'thread_dirs', it is not used
Minor cleanup
into debian.(none):/M51/rowlock-5.1
BitKeeper/deleted/.del-readme.txt~3:
Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3
Makefile.am:
Manual merge: "row_lock" suite is deleted.
into trift2.:/MySQL/M51/bug26609-5.1
Makefile.am:
Manual merge: Include the "row_lock" suite in the "test-bt" target.
scripts/make_binary_distribution.sh:
Manual merge: Include the additional test suites in the binary package.
Makefile.am:
This is *no* fix, it is just to avoid the failure of the "jp" test suite
(28563 is the number of the bug) from causing havoc in release builds.
into trift-lap.fambruehe:/MySQL/M51/push-5.1
mysql-test/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
No need to propagate 5.0 changes into a 5.1 file which is deleted anyway.
Makefile.am:
Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target.
storage/ndb/src/ndbapi/NdbImpl.hpp:
Manual merge from 5.0.40
into trift-lap.fambruehe:/MySQL/M50/push-5.0
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
Manual merge: Use the standard text.
Makefile.am:
Removed debian/control creation from the top level dist-hook
configure.in:
Create debian/control from configure again
debian/rules:
Protect debian/control from the debuild distclean run.
Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
scripts/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
client/mysql_upgrade.c:
Use remote
mysql-test/r/mysql_upgrade.result:
Use remote
Makefile.am:
Merge "build scripts/ a little earlier"
include/my_global.h:
Merge
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
BitKeeper/etc/ignore:
Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
CMakeLists.txt:
Build files also in scripts/
Makefile.am:
Build scripts/ a little earlier to make
the scripts/mysql_fix_privilege_tables_sql.c file available
when client/ is built
client/mysql_upgrade.c:
Updated version of mysql_upgrade with comments and logical functions
include/my_global.h:
Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
mysql-test/r/mysql_upgrade.result:
Update result
mysql-test/t/mysql_upgrade.test:
Add more tests for different bugs related to mysql_upgrade
scripts/Makefile.am:
Build comp_sql and mysql_fix_privilege_tables_sql.c
sql/mysql_priv.h:
Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
scripts/CMakeLists.txt:
New BitKeeper file ``scripts/CMakeLists.txt''
scripts/comp_sql.c:
New BitKeeper file ``scripts/comp_sql.c''
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769
Cleaned up some things to make building the packages go a little smoother.
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package.
---
Corrected incorrect variable name
---
Renamed template files to have shorter names.
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist.
debian/libmysqlclientSLIB-dev.README.Maintainer.in:
Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
debian/libmysqlclientSLIB-dev.dirs.in:
Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
debian/libmysqlclientSLIB-dev.docs.in:
Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
debian/libmysqlclientSLIB-dev.examples.in:
Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
debian/libmysqlclientSLIB-dev.files.in:
Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
debian/libmysqlclientSLIB-dev.links.in:
Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
debian/libmysqlclientSLIB.README.Debian.in:
Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
debian/libmysqlclientSLIB.dirs.in:
Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
debian/libmysqlclientSLIB.docs.in:
Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
debian/libmysqlclientSLIB.files.in:
Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
debian/libmysqlclientSLIB.postinst.in:
Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
debian/libndbclientNLIB-dev.dirs.in:
Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
debian/libndbclientNLIB-dev.files.in:
Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
debian/libndbclientNLIB-dev.links.in:
Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
debian/libndbclientNLIB.README.Debian.in:
Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
debian/libndbclientNLIB.dirs.in:
Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
debian/libndbclientNLIB.files.in:
Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
debian/libndbclientNLIB.postinst.in:
Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
debian/mysql-client-BASE.NEWS.in:
Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
debian/mysql-client-BASE.README.Debian.in:
Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
debian/mysql-client-BASE.dirs.in:
Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
debian/mysql-client-BASE.docs.in:
Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
debian/mysql-extra-BASE.dirs.in:
Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
debian/mysql-extra-BASE.files.in:
Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
debian/mysql-management-BASE.dirs.in:
Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
debian/mysql-management-BASE.files.in:
Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
debian/mysql-management-BASE.mysql-management.init.in:
Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
debian/mysql-server-BASE.NEWS.in:
Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
debian/mysql-server-BASE.README.Debian.in:
Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
debian/mysql-server-BASE.dirs.in:
Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
debian/mysql-server-BASE.docs.in:
Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
debian/mysql-server-BASE.links.in:
Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
debian/mysql-server-BASE.logcheck.ignore.server.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
debian/mysql-server-BASE.logcheck.ignore.workstation.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
debian/mysql-server-BASE.mysql-server.logrotate.in:
Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
debian/mysql-server-BASE.preinst.in:
Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
debian/mysql-server-BASE.prerm.in:
Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
debian/mysql-server-PREV.preinst.in:
Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
debian/mysql-storage-BASE.dirs.in:
Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
debian/mysql-storage-BASE.files.in:
Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
debian/mysql-storage-BASE.mysql-storage.init.in:
Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
debian/mysql-test-BASE.dirs.in:
Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
debian/mysql-test-BASE.files.in:
Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
debian/mysql-tools-BASE.dirs.in:
Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
debian/mysql-tools-BASE.files.in:
Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
Makefile.am:
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
Need to generate the control file in the dist dir - not the source dir.
configure.in:
Added variables to support the generation of debian/control and debian/defs.mk from configure
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
debian/Makefile.am:
Distribute the generated control file so that debuild will work naturally.
---
Broke the EXTRA_DIST line into separate lines.
Added defs.mk.in
---
Modified debian/Makefile to use the new shorter template file names.
debian/control.in:
Changed substitution variables to match already existing autoconf vars.
debian/defs.mk.in:
Changed substitution variables to match already existing autoconf vars.
Made defs.mk.in generated from template.
Persisted variables here.
---
Corrected incorrect variable name
debian/mysql-client-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-client-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.config.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postinst.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postrm.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.templates.in:
Changed substitution variables to match already existing autoconf vars.
debian/po/POTFILES.in.in:
Changed substitution variables to match already existing autoconf vars.
debian/rules:
BUG#27769 - MySQL should include debian packaging dir
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
Prevented the test suite from being run unless requested.
---
Needed a space between ifneq and (
---
The variable substitution was stepping on the Makefile from automake.
---
Left off the debian/ prefix to the Makefile filter.
---
Changed substitution variables to match already existing autoconf vars.
---
Save debian/defs.mk from make distclean
debian/source.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
Makefile.am:
Added debian dir to the DIST_SUBDIRS.
configure.in:
Merged changes from 5.0 for adding debian dir.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
---
Removed added manpages that aren't appropriate for our build.
---
Added debian dir to list of dist targets.
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
BitKeeper/deleted/.del-configure.in.rej:
Delete: configure.in.rej
Makefile.am:
Added debian dir to list of dist targets.
configure.in:
Added debian/Makefile to configure.in to support make dist
BitKeeper/deleted/.del-comp_err.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-msql2mysql.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-my_print_defaults.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisam_ftdump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamchk.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisampack.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_config.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_convert_table_format.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_explain_log.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_find_rows.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_fix_extensions.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_install_db.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_secure_installation.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_setpermission.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_tableinfo.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_waitpid.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbinlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbug.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlcheck.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqldumpslow.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlimport.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlmanager.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqltest.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-pack_isam.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolve_stack_dump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolveip.1:
Adding files to support building for debian.
debian/Makefile.am:
Added list of files needed to be distributed in debian dir.
debian/README.Maintainer:
Adding files to support building for debian.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
debian/changelog:
Adding files to support building for debian.
debian/compat:
Adding files to support building for debian.
debian/control.in:
Adding files to support building for debian.
debian/copyright.more:
Adding files to support building for debian.
debian/copyright:
Adding files to support building for debian.
debian/defs.mk:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.README.Maintainer.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.examples.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.links.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.postinst.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.links.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.postinst.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-common.README.Debian.in:
Adding files to support building for debian.
debian/mysql-common.dirs.in:
Adding files to support building for debian.
debian/mysql-common.files.in:
Adding files to support building for debian.
debian/mysql-common.postrm.in:
Adding files to support building for debian.
debian/mysql-common.preinst.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.mysql-management.init.in:
Adding files to support building for debian.
debian/mysql-server-MYOLDVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.config.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.links.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.paranoid.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.server.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.workstation.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.mysql-server.logrotate.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postrm.in:
Adding files to support building for debian.
debian/additions/my.cnf:
Adding files to support building for debian.
debian/additions/mysql-server.lintian-overrides:
Adding files to support building for debian.
debian/additions/ndb_mgmd.cnf:
Adding files to support building for debian.
debian/mysql-server-MYVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.prerm.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.templates.in:
Adding files to support building for debian.
debian/mysql-server.preinst.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.mysql-storage.init.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.files.in:
Adding files to support building for debian.
debian/po/POTFILES.in.in:
Adding files to support building for debian.
debian/po/ca.po:
Adding files to support building for debian.
debian/po/cs.po:
Adding files to support building for debian.
debian/po/da.po:
Adding files to support building for debian.
debian/po/de.po:
Adding files to support building for debian.
debian/po/es.po:
Adding files to support building for debian.
debian/po/eu.po:
Adding files to support building for debian.
debian/po/fr.po:
Adding files to support building for debian.
debian/po/gl.po:
Adding files to support building for debian.
debian/po/it.po:
Adding files to support building for debian.
debian/po/ja.po:
Adding files to support building for debian.
debian/po/nb.po:
Adding files to support building for debian.
debian/po/nl.po:
Adding files to support building for debian.
debian/po/pt.po:
Adding files to support building for debian.
debian/po/pt_BR.po:
Adding files to support building for debian.
debian/po/ro.po:
Adding files to support building for debian.
debian/po/ru.po:
Adding files to support building for debian.
debian/po/sv.po:
Adding files to support building for debian.
debian/po/templates.pot:
Adding files to support building for debian.
debian/po/tr.po:
Adding files to support building for debian.
debian/rules:
Adding files to support building for debian.
---
Added semi-colons to fix syntax error.
debian/source.lintian-overrides.in:
Adding files to support building for debian.
debian/watch:
Adding files to support building for debian.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
- Move the link_sources command from top level Makefile into each subdir
that need to link files
BitKeeper/etc/ignore:
Added libmysqld/link_sources libmysql/link_sources include/link_sources client/link_sources to the ignore list
Makefile.am:
Move link_sources down into each sub directory that might need it
client/Makefile.am:
Add "link_sources" to BUILT_SOURCES
configure.in:
Move link_sources down into each sub directory that might need it
include/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.shared:
Add "link_sources" to BUILT_SOURCES
libmysqld/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysqld/examples/Makefile.am:
Add "link_sources" to BUILT_SOURCES
netware/Makefile.am:
Add "link_sources" to BUILT_SOURCES
sql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
Don't use explicit calls to mysql-test-run in spec
Makefile.am:
Don't use explicit calls to mysql-test-run in spec
support-files/mysql.spec.sh:
Don't use explicit calls to mysql-test-run in spec
- for including qa developed suites
- for options to run 'fast' tests
Makefile.am:
Modifications to include new test options
- for including qa developed suites
- for options to run 'fast' tests
- test suites developed by QA
- additional 'fast' test options
Makefile.am:
Added test options to cover
- test suites developed by QA
- additional 'fast' test options
