into mysql.com:/Users/kent/mysql/bk/mysql-4.1
configure.in:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
support-files/mysql.spec.sh:
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
support-files/mysql.spec.sh:
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
manual merge from 4.0.
support-files/mysql.spec.sh:
Manual merge of the fix for bug#20216.
(became necessary because 4.0 and 4.1 spec files use different file sort order).
Disable the simplistic auto dependency scan for test/bench (bug#20078)
support-files/mysql.spec.sh:
Disable the simplistic auto dependency scan for test/bench (bug#20078)
support-files/mysql.server.sh:
Ensure that some necessary / useful system services have been started already,
when the MySQL server is started.
This fixes bug#18810 and bug#20118
Use "./libtool --mode=execute" to find real path to executables
support-files/mysql.spec.sh:
Use "./libtool --mode=execute" to find real path to executables
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
support-files/mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
Let "make install" install mysql-test-run.pl
support-files/mysql.spec.sh:
Use "-i" on "make test-force";
this will prevent "make" from writing "***" which in turn was treated as a _build_ error
by the log evaluation tool, causing it not to list the failing tests.
(Backport of an identical change from 5.0)
support-files/mysql.spec.sh:
We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
The fully static RPM build on "build" also does not work with the bundled zlib.
With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
and the one already installed on the system for the "max" build which is also labeled "experimental".
(Backport of an identical change from 5.0)
Fix a possible problem on RPM un-install. bug#15145
support-files/mysql.spec.sh:
Extend the file existence check for "init.d/mysql" on un-install
to also guard the call to "insserv"/"chkconfig".
bug#15145, br#5369 / 5586, csc#7129
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
script (we now use Do-pkg for building OS X packages)
BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24:
Delete: NEW-RPMS/.cvsignore
BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206:
Delete: support-files/MacOSX/make_mysql_pkg.pl
netware/BUILD/compile-linux-tools:
- removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-END:
- removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-src:
- removed reference to the NEW-RPMS directory
directory - these files are now maintained in the mysqldoc
repository and included in the source distribution during the
release build. Updated the configure.in script and Makefiles to
create the man page file list at build time
- Updated the file list in the RPM spec file to include all currently
available man pages (this can not be done with wildcards, as
the man pages are spread across several subpackages. However, RPM
warns about unpackaged files, so newly added man pages can be
spotted)
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
Delete: man/isamlog.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
Delete: man/mysql.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
Delete: man/perror.1.in
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
Delete: man/replace.1.in
configure.in:
- dynamically add man pages included in the man directory
(the BK tree only contains one dummy file, the directory is
populated by the Bootstrap script by copying current man pages
from the documentation server)
man/Makefile.am:
- removed hard-coded list of man pages, the list is populated
during the configure stage. When building from BK, only one
placeholder file exists. For the release builds, this directory
is populated by the Bootstrap script, which takes man page files
from the documentation server.
man/mysqlman.1:
- removed version number
support-files/mysql.spec.sh:
- adjusted file list: added man pages that are now part of the
official source distribution (taken from the documentation
server)
to assign a potential existing mysql user to the correct user group (BUG#12823)
support-files/mysql.spec.sh:
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- Save the perror binary built during Max build so it supports the NDB
error codes (BUG#13740)
- added a separate macro "mysqld_group" to be able to define the
user group of the mysql user seperately, if desired.
support-files/mysql.spec.sh:
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- Save the perror binary built during Max build so it supports the NDB
error codes (BUG#13740)
- added a separate macro "mysqld_group" to be able to define the
user group of the mysql user seperately, if desired.
configuration files. (Bug #13811)
support-files/my-huge.cnf.sh:
Fix name of thread_cache_size setting.
support-files/my-innodb-heavy-4G.cnf.sh:
Fix name of thread_cache_size setting.
support-files/my-large.cnf.sh:
Fix name of thread_cache_size setting.
spec file (the $RBR variable did not get expanded, thus leaving old build
roots behind)
support-files/mysql.spec.sh:
- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
$RBR variable did not get expanded, thus leaving old build roots behind)
Enable "make distcheck" to work
configure.in:
Enable "make distcheck" to work
Docs/Makefile.am:
Enable "make distcheck" to work
Makefile.am:
Enable "make distcheck" to work
client/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
Enable "make distcheck" to work
include/Makefile.am:
Enable "make distcheck" to work
libmysql/Makefile.am:
Enable "make distcheck" to work
libmysql_r/Makefile.am:
Enable "make distcheck" to work
libmysqld/Makefile.am:
Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
Enable "make distcheck" to work
mysql-test/Makefile.am:
Enable "make distcheck" to work
ndb/docs/Makefile.am:
Enable "make distcheck" to work
netware/Makefile.am:
Enable "make distcheck" to work
pstack/Makefile.am:
Enable "make distcheck" to work
scripts/Makefile.am:
Enable "make distcheck" to work
sql-bench/Makefile.am:
Enable "make distcheck" to work
sql/Makefile.am:
Enable "make distcheck" to work
sql/share/Makefile.am:
Enable "make distcheck" to work
support-files/Makefile.am:
Enable "make distcheck" to work
into mysql.com:/space/my/mysql-4.1-merge
support-files/MacOSX/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
support-files/MacOSX/postflight.sh:
Auto merged
preflight/postflight instead, so they are run every time a PKG is installed, not only for
a fresh installation
support-files/MacOSX/Makefile.am:
- Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/postflight.sh:
- Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/preflight.sh:
- Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time, not only for a fresh installation
- fixed comment typo
the rpm spec file changelog
sql/ha_innodb.cc:
- Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
- manual merge from 4.0
the MySQL-server RPM spec file (BUG#12348)
support-files/mysql.spec.sh:
- Fixed the creation of the mysql user group account in the postinstall section
(BUG#12348)
