BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
Auto merged
configure.in:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
man/Makefile.am:
- after merge fix
support-files/mysql.spec.sh:
- after merge fix
- 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
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
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
Initial Metrowerks CodeWarrior compiler support
new file
support-files/MacOSX/mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
Initial Metrowerks CodeWarrior compiler support
Mac OS X: the name of the startup script itself must match the
name of the subdirectory it's located in. Changed MySQL->MySQLCOM
in the Do-pkg script and renamed the file in BK. (Thanks to Bryan
McCormack for reporting this)
Build-tools/Do-pkg:
- renamed script from MySQL to MySQLCOM to match the name of the
directory it's installed in
support-files/MacOSX/MySQLCOM:
- Fixed the file and directory name to match the actual location
/Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM
to avoid a name space collision with the MySQL Startup Item shipped
with Mac OS X Server, updated the MySQLStartupItem PKG version
number to reflect the change.
Build-tools/Do-pkg:
- Renamed the StartupItem directory from /Library/StartupItems/MySQL
to /Library/StartupItems/MySQLCOM to avoid a name space collision
with the MySQL Startup Item in Mac OS X Server
support-files/MacOSX/StartupItem.Description.plist:
- Bumped up the StartupItem Package version to 1.1 to indicate the
change in directory naming
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0umod.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dbug.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_op.result:
Auto merged
Build-tools/Bootstrap:
Merge with 4.0
client/mysql.cc:
Merge with 4.0
client/mysqldump.c:
Merge with 4.0
client/mysqltest.c:
Use local version
innobase/btr/btr0cur.c:
Merge with 4.0 (Heikki should check if we should remove btr_cur_update_sec_rec_in_place()
libmysql/libmysql.c:
Merge with 4.0
libmysqld/lib_sql.cc:
Merge with 4.0
myisam/mi_key.c:
Merge with 4.0
myisam/mi_search.c:
Merge with 4.0
mysql-test/r/binary.result:
Merge with 4.0
mysql-test/r/func_group.result:
Merge with 4.0
mysql-test/r/func_str.result:
Merge with 4.0
mysql-test/r/func_time.result:
Merge with 4.0
mysql-test/r/group_by.result:
Merge with 4.0
mysql-test/r/handler.result:
Merge with 4.0
mysql-test/r/innodb.result:
Merge with 4.0
mysql-test/r/insert.result:
Merge with 4.0
mysql-test/r/join_outer.result:
Merge with 4.0
mysql-test/r/loaddata.result:
Merge with 4.0
mysql-test/r/lowercase_table.result:
Merge with 4.0
mysql-test/r/multi_update.result:
Merge with 4.0
mysql-test/r/mysqldump.result:
Merge with 4.0
mysql-test/r/query_cache.result:
Merge with 4.0
mysql-test/r/rpl_max_relay_size.result:
Merge with 4.0
mysql-test/r/rpl_rotate_logs.result:
Merge with 4.0
mysql-test/r/rpl_trunc_binlog.result:
Merge with 4.0
mysql-test/r/select_found.result:
Merge with 4.0
mysql-test/r/symlink.result:
Merge with 4.0
mysql-test/r/truncate.result:
Merge with 4.0
mysql-test/r/type_blob.result:
Merge with 4.0
mysql-test/r/type_datetime.result:
Merge with 4.0
mysql-test/r/type_decimal.result:
Merge with 4.0
mysql-test/r/type_enum.result:
Merge with 4.0
mysql-test/r/type_timestamp.result:
Merge with 4.0
mysql-test/r/union.result:
Merge with 4.0
mysql-test/t/auto_increment.test:
Merge with 4.0
mysql-test/t/bdb.test:
Merge with 4.0
mysql-test/t/func_group.test:
Merge with 4.0
mysql-test/t/func_op.test:
Merge with 4.0
mysql-test/t/func_str.test:
Merge with 4.0
mysql-test/t/func_time.test:
Merge with 4.0
mysql-test/t/group_by.test:
Merge with 4.0
mysql-test/t/handler.test:
Merge with 4.0
mysql-test/t/innodb.test:
Merge with 4.0
mysql-test/t/insert.test:
Merge with 4.0
mysql-test/t/join_outer.test:
Merge with 4.0
mysql-test/t/limit.test:
Merge with 4.0
mysql-test/t/loaddata.test:
Merge with 4.0
mysql-test/t/lowercase_table.test:
Merge with 4.0
mysql-test/t/multi_update.test:
Merge with 4.0
mysql-test/t/mysqldump.test:
Merge with 4.0
mysql-test/t/query_cache.test:
Merge with 4.0
mysql-test/t/rpl_log_pos.test:
Merge with 4.0
mysql-test/t/rpl_max_relay_size.test:
Merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
Merge with 4.0
mysql-test/t/rpl_trunc_binlog.test:
Merge with 4.0
mysql-test/t/select_found.test:
Merge with 4.0
mysql-test/t/symlink.test:
Merge with 4.0
mysql-test/t/truncate.test:
Merge with 4.0
mysql-test/t/type_blob.test:
Merge with 4.0
mysql-test/t/type_datetime.test:
Merge with 4.0
mysql-test/t/type_decimal.test:
Merge with 4.0
mysql-test/t/type_enum.test:
Merge with 4.0
mysql-test/t/type_timestamp.test:
Merge with 4.0
mysql-test/t/union.test:
Merge with 4.0
mysys/charset.c:
Merge with 4.0
mysys/my_init.c:
Merge with 4.0
mysys/my_symlink.c:
Merge with 4.0
mysys/my_thr_init.c:
Merge with 4.0
regex/reginit.c:
Merge with 4.0
sql/field.cc:
Change fix_datetime() to print errors
sql/field.h:
Merge with 4.0
sql/ha_innodb.cc:
Merge with 4.0
sql/item.cc:
Merge with 4.0
sql/item.h:
Merge with 4.0
sql/item_cmpfunc.cc:
Merge with 4.0
sql/item_func.cc:
Merge with 4.0
sql/item_func.h:
Merge with 4.0
sql/item_strfunc.cc:
Merge with 4.0
sql/item_strfunc.h:
Merge with 4.0
sql/item_sum.cc:
Merge with 4.0
sql/item_sum.h:
Merge with 4.0
sql/item_timefunc.cc:
Merge with 4.0
sql/lex.h:
Merge with 4.0
sql/log.cc:
Merge with 4.0
sql/log_event.cc:
Merge with 4.0
sql/log_event.h:
Merge with 4.0
sql/mysql_priv.h:
Merge with 4.0
sql/mysqld.cc:
Merge with 4.0
sql/nt_servc.cc:
Merge with 4.0
sql/opt_range.cc:
Merge with 4.0
sql/records.cc:
Merge with 4.0
sql/repl_failsafe.cc:
Merge with 4.0
sql/slave.cc:
Merge with 4.0
sql/sql_acl.cc:
Merge with 4.0
sql/sql_analyse.cc:
Merge with 4.0
sql/sql_base.cc:
Merge with 4.0
sql/sql_cache.cc:
Merge with 4.0
sql/sql_class.h:
Merge with 4.0
sql/sql_db.cc:
Merge with 4.0
sql/sql_delete.cc:
Merge with 4.0
sql/sql_insert.cc:
Merge with 4.0
sql/sql_load.cc:
Merge with 4.0
sql/sql_parse.cc:
Merge with 4.0
sql/sql_rename.cc:
Merge with 4.0
sql/sql_select.cc:
Merge with 4.0
sql/sql_show.cc:
Merge with 4.0
sql/sql_table.cc:
Merge with 4.0
sql/sql_update.cc:
Merge with 4.0
sql/sql_yacc.yy:
Merge with 4.0
sql/table.cc:
Merge with 4.0
sql/table.h:
Merge with 4.0
sql/time.cc:
Merge with 4.0
sql/uniques.cc:
Merge with 4.0
strings/ctype-tis620.c:
Merge with 4.0
strings/strto.c:
Merge with 4.0
support-files/mysql.server.sh:
Merge with 4.0
support-files/mysql.spec.sh:
Merge with 4.0
- postinstall of the Mac OS X PKG failed as a parameter for
mysql_install_db was changed for MySQL 4.1
- postinstall of the Server RPM failed as mysql_create_system_tables was
missing from the file list
support-files/MacOSX/postinstall.sh:
- Fix parameter for mysql_install_db (it was changed from -IN-RPM to --rpm
in the 4.1 tree)
support-files/mysql.spec.sh:
- Added missing file mysql_create_system_tables to the server subpackage
"$1: unbound variable" error when no option was given
support-files/MacOSX/MySQL:
- Suppress the annoying "$1: unbound variable" error when no option
was given
for Mac OS X and add it to the installation Disk Image.
Build-tools/Do-pkg:
- added code to build the StartupItem PKG along with the MySQL PKG and
add it to the resulting Disk Image (can be skipped with --skip-si)
- lots of cleanups (use more builtin Perl functions instead of
subprocesses, enable a full dry run without errors)
support-files/MacOSX/StartupItem.Info.plist:
- removed IFPkgFlagOverwritePermissions and IFPkgFlagUseUserMask
startup item: MySQL (the startup script), StartupItem.Description.plist,
StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
(post-installation script for the Startup Item package)
- modified support-files/MacOSX/Makefile.am to include the newly added files
in the source distribution
BitKeeper/etc/ignore:
Added scripts/make_win_src_distribution to the ignore list
support-files/MacOSX/Makefile.am:
- added the Mac OS X StartupItem files to the source distribution
the installation to make sure the privilege tables are being
installed even if the DNS configuration is broken, which seems
to be quite common (reverse lookups to "hostname" fail).
This should resolve the problem many Mac OS users experience
("Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
exist") when they try to start MySQL after installing the PKG.
instead of being an individual file to avoid redundancy
BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd:
Delete: support-files/MacOSX/ReadMe.txt
Docs/Makefile.am:
- Generate the MacOS ReadMe.txt from the manual
support-files/MacOSX/Makefile.am:
- Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated
- moved helper functions from Bootstrap script to logger.pm
Build-tools/Bootstrap:
- renamed logfile -> LOGFILE
- moved functions abort() and run_command() to logger.pm for better
reusability
Build-tools/Do-pkg:
- heavily reworked: now make use of the logger.pm helper functions
- added new options: --dry-run, --log, --mail, --verbose
Build-tools/logger.pm:
- added functions run_command() and abort() from Bootstrap script for
better code reusability
support-files/MacOSX/postinstall.sh:
- made script more robust
distribution
- added Bootstrap, logger.pm and Do-pkg to Build-tools:
Bootstrap is used to build the source distribution for the binary builds
logger.pm includes some helper functions
Do-pkg converts a binary distribution into a Mac OS X PKG (still needs
some polishing)
support-files/MacOSX/Description.plist.sh:
- Shortened IFPkgDescriptionDescription a bit
support-files/MacOSX/Makefile.am:
- Added more files (StartupParameters.plist, postinstall, preinstall) to
distribution
