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)
Enabled yaSSL
mysql-test-run.pl:
Increased test case timeout from 15 min
mysql-test/mysql-test-run.pl:
Increased test case timeout from 15 min
support-files/mysql.spec.sh:
Enabled yaSSL
Give mode arguments the same way in all places
Moved copy of mysqld.a to "standard" build, but
disabled it as we don't do embedded yet in 5.0
support-files/mysql.spec.sh:
Give mode arguments the same way in all places
Moved copy of mysqld.a to "standard" build, but
disabled it as we don't do embedded yet in 5.0
For 5.x, always compile with --with-big-tables
Copy the config.log file to location outside
the build tree
support-files/mysql.spec.sh:
For 5.x, always compile with --with-big-tables
Copy the config.log file to location outside
the build tree
Removed unneeded/obsolte configure options
Added archive engine to standard server
Removed the embedded server from experimental server
Changed suffix "-Max" => "-max"
Changed comment string "Max" => "Experimental"
support-files/mysql.spec.sh:
Removed unneeded/obsolte configure options
Added archive engine to standard server
Removed the embedded server from experimental server
Changed suffix "-Max" => "-max"
Changed comment string "Max" => "Experimental"
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
basedir and datadir settings in script may be overwritten by settings
in configuration files. (Bug #12550)
support-files/mysql.server.sh:
Note that basedir, datadir settings can be overwritten by configuration,
and make sbindir and libexecdir distinct from bindir when setting it
based on basedir.
into mishka.local:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
Auto merged
configure.in:
Auto merged
mysql-test/include/ps_conv.inc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
VC++Files/client/mysqltest.dsp:
manual merge
VC++Files/sql/mysqld.dsp:
manual merge
mysql-test/r/grant2.result:
patch merge
mysql-test/r/subselect2.result:
manual merge
mysql-test/t/grant2.test:
patch merge
mysys/charset.c:
Remove already deleted function
sql/examples/ha_archive.h:
Manual merge
sql/sql_acl.cc:
manual merge
sql/sql_db.cc:
merge (no differences)
sql/sql_select.cc:
manual merge
sql/table.h:
merge (no differences)
tests/mysql_client_test.c:
patch merge
CFBundleShortVersionString in Info.plist may not include a version
suffix like "-beta" (BUG#12584)
- Minor cleanup: removed two unused keys from Info.plist: IFMajorVersion
and IFMinorVersion
support-files/MacOSX/Info.plist.sh:
- Set CFBundleShortVersionString to MYSQL_NO_DASH_VERSION, not VERSION
(BUG#12584)
- removed two obsolete keys: IFMajorVersion and IFMinorVersion - they
are not actually used according to the "Software Distribution"
documentation at http://developer.apple.com/
support-files/MacOSX/Makefile.am:
- added an sed call to replace @MYSQL_NO_DASH_VERSION@ (e.g. for
Info.plist (BUG#12584)
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)
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/t/alias.test:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/bool.test:
Auto merged
mysql-test/t/connect.test:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ctype_many.test:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/derived.test:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/endspace.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/fulltext_order_by.test:
Auto merged
mysql-test/t/func_compress.test:
Auto merged
mysql-test/t/func_concat.test:
Auto merged
mysql-test/t/func_date_add.test:
Auto merged
mysql-test/t/func_equal.test:
Auto merged
mysql-test/t/func_if.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_set.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/gis-rtree.test:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
mysql-test/t/heap_hash.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/keywords.test:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/lock.test:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysql-test/t/lowercase_table3.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysqlbinlog2.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_grant.later:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
mysql-test/t/ndb_types.test:
Auto merged
mysql-test/t/ndb_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysql-test/t/olap.test:
Auto merged
mysql-test/t/openssl_1.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/ps_4heap.test:
Auto merged
mysql-test/t/ps_5merge.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/replace.test:
Auto merged
mysql-test/t/row.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysql-test/t/rpl000018.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_charset.test:
Auto merged
mysql-test/t/rpl_create_database.test:
Auto merged
mysql-test/t/rpl_ddl.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_empty_master_crash.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_flush_tables.test:
Auto merged
mysql-test/t/rpl_get_lock.test:
Auto merged
mysql-test/t/rpl_heap.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_max_relay_size.test:
Auto merged
mysql-test/t/rpl_multi_query.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_redirect.test:
Auto merged
mysql-test/t/rpl_relayrotate.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_reset_slave.test:
Auto merged
mysql-test/t/rpl_server_id2.test:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
mysql-test/t/rpl_timezone.test:
Auto merged
mysql-test/t/rpl_user_variables.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/t/synchronization.test:
Auto merged
mysql-test/t/system_mysql_db.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
mysql-test/t/timezone2.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysql-test/t/user_var-binlog.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
Simple merge
mysql-test/r/ps_grant.result:
Simple merge
mysql-test/t/analyse.test:
Simple merge
mysql-test/t/auto_increment.test:
Simple merge
mysql-test/t/bdb.test:
Simple merge
mysql-test/t/bigint.test:
Simple merge
mysql-test/t/case.test:
Simple merge
mysql-test/t/cast.test:
Simple merge
mysql-test/t/check.test:
Simple merge
mysql-test/t/count_distinct.test:
Simple merge
mysql-test/t/ctype_latin1_de.test:
Simple merge
mysql-test/t/ctype_uca.test:
Simple merge
mysql-test/t/ctype_ucs.test:
Simple merge
mysql-test/t/ctype_utf8.test:
Simple merge
mysql-test/t/delete.test:
Simple merge
mysql-test/t/flush_block_commit.test:
Simple merge
mysql-test/t/func_default.test:
Simple merge
mysql-test/t/func_gconcat.test:
Simple merge
mysql-test/t/func_group.test:
Aligned code with 4.1
mysql-test/t/func_in.test:
Simple merge
mysql-test/t/func_math.test:
Simple merge
mysql-test/t/func_misc.test:
Simple merge
mysql-test/t/func_test.test:
Simple merge
mysql-test/t/func_time.test:
Simple merge
mysql-test/t/group_by.test:
Simple merge
mysql-test/t/having.test:
Simple merge
mysql-test/t/innodb.test:
Simple merge
mysql-test/t/insert.test:
Simple merge
mysql-test/t/join_outer.test:
Simple merge
mysql-test/t/kill.test:
Simple merge
mysql-test/t/loaddata.test:
Simple merge
mysql-test/t/lock_multi.test:
Simple merge
mysql-test/t/multi_update.test:
Simple merge
mysql-test/t/mysqlbinlog.test:
Simple merge
mysql-test/t/mysqldump.test:
Aligned code with 4.1
mysql-test/t/mysqltest.test:
Simple merge
mysql-test/t/ndb_basic.test:
Simple merge
mysql-test/t/ndb_cache.test:
Simple merge
mysql-test/t/ndb_subquery.test:
Simple merge
mysql-test/t/ps_grant.test:
Simple merge
mysql-test/t/range.test:
Simple merge
mysql-test/t/rpl_drop_temp.test:
Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
Simple merge
mysql-test/t/rpl_loaddatalocal.test:
Simple merge
mysql-test/t/rpl_rotate_logs.test:
Simple merge
mysql-test/t/rpl_until.test:
Simple merge
mysql-test/t/rpl_variables.test:
Simple merge
mysql-test/t/select.test:
Simple merge
mysql-test/t/sql_mode.test:
Simple merge
mysql-test/t/type_blob.test:
Simple merge
mysql-test/t/type_decimal.test:
Simple merge
mysql-test/t/user_var.test:
Simple merge
mysql-test/t/variables.test:
Simple merge
sql/lock.cc:
Simple optimization
sql/mysql_priv.h:
Simple merge
sql/sql_table.cc:
Simple merge
sql/table.cc:
Simple merge
sql/unireg.cc:
Simple merge
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
scripts/Makefile.am:
- don't install the following files with "make install", as they are
not needed to be installed:
make_win_src_distribution, make_win_binary_distribution,
make_binary_distribution, make_sharedlib_distribution
support-files/MacOSX/Makefile.am:
- don't install the Mac OS X support files when running "make install" -
they're not needed outside of the source tree (BUG#12057)
support-files/Makefile.am:
- don't install the RPM spec files with "make install" - they are not
needed outside of the source tree
mysql user account to that group in the server postinstall section of the RPM spec
file
support-files/mysql.spec.sh:
- manual merge of the fix for BUG#10984: create a "mysql" user group and assign the
mysql user account to that group in the server postinstall section.
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
Brazilian translations, more consequent use of macros)
support-files/mysql.spec.sh:
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
Brazilian translations, more consequent use of macros)
"--with static" or "--define '_with_static 1'" to the RPM build options.
Static linking really only makes sense when linking against the specially patched
glibc 2.2.5.
support-files/mysql.spec.sh:
- Do not build statically on i386 by default, only when adding either "--with
static" or "--define '_with_static 1'" to the RPM build options. Static
linking really only makes sense when linking against the specially patched
glibc 2.2.5.
when doing "make install" (they are not needed/useful) outside the build tree. Added
"mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
scripts/Makefile.am:
- no need to install "make_win_src_distribution" and "make_win_binary_distribution"
in "make install" (BUG#10676)
support-files/mysql.spec.sh:
- added mysql_client_test to the "bench" subpackage (BUG 10676)
- use "mysqldatadir" variable instead of hard-coding the path multiple times
- use the "mysqld_user" variable on all occasions a user name is referenced
- removed (incomplete) Brazilian translations
- removed redundant release tags from the subpackage descriptions
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
Delete: support-files/mysql-max.spec.sh
configure.in:
- removed references to some obsolete files
scripts/make_binary_distribution.sh:
- removed references to some obsolete files
