innobase/ibuf/ibuf0ibuf.c:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
- 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
Print correct OS error number also on Windows if we run out of memory
innobase/ut/ut0mem.c:
Print correct OS error number also on Windows if we run out of memory
Correction for min/max optimization of queries with outer joins
sql/opt_sum.cc:
Correction for min/max optimization of queries with outer joins
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
fixed error handling in HANDLER ... READ FIRST
sql/sql_handler.cc:
fix error handling in HANDLER ... READ FIRST
sql/sql_table.cc:
ALTER TABLE closes all open HANDLER's for the table in question
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
innobase/ibuf/ibuf0ibuf.c:
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
configure.in - there are 32bit installations of HPUX11 out there
and compiling for these by manually adding +DAportable to CFLAGS
did not work. Better add +DD64 manually, if you need it.
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
Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST
innobase/row/row0sel.c:
Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
sql/share/english/errmsg.txt:
Reverted Sinisa's patch again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
sql/sql_acl.cc:
Reverted Sinisa's patch again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)