- "--config-env" can now be given more than once
- don't be smart about version suffixes
Build-tools/Do-compile:
- "--config-env" can now be given more than once
- don't be smart about version suffixes
- Do-compile: fix small (cosmetical, not critical) typo
Build-tools/Do-compile:
- added a fast test run with dynamic-row tables
- fix small (cosmetical, not critical) typo
- Do-compile: fix small (cosmetical, not critical) typo
Build-tools/Do-compile:
- added a fast test run with dynamic-row tables
- fix small (cosmetical, not critical) typo
- fixed essential piece missing from last merge with 3.23 tree
(InnoDB option)
- Added "autoextend" parameter to InnoDB startup options to be able
to pass the full sql-bench run without hitting an "table space full"
error
Build-tools/Do-compile:
- fixed essential piece missing from last merge with 3.23 tree
(InnoDB option)
- Added "autoextend" parameter to InnoDB startup options to be able
to pass the full sql-bench run without hitting an "table space full"
error
necessary (required to actually pass the sql-bench without aborting
with "table space full")
Build-tools/Do-compile:
- Enable InnoDB to autoextend the table space if necessary (required to
actually pass the sql-bench without aborting with "table space full")
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Build-tools/mysql-copyright-2:
Auto merged
Build-tools/mysql-copyright:
Auto merged
heap/heapdef.h:
Auto merged
heap/hp_open.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysys/safemalloc.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.res:
Auto merged
Build-tools/Do-compile:
merge
Docs/manual.texi:
merge
configure.in:
merge
mysql-test/r/distinct.result:
merge
mysql-test/r/null_key.result:
merge
sql/ha_innodb.cc:
merge
sql/item.h:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
support-files/mysql.spec.sh:
merge
Build-tools/Do-compile:
- fixed brainfart that ruined the 3.23.53-Max binaries: of course
"--with-innodb" has to be added, when requested (will be part of
3.23.53a packages now)
- bumped up version number to 3.23.54 in configure.in
- replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified
scripts/make_binary_distribution.sh and Build-tools/mysql-copyright*
accordingly.
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
Delete: Docs/LICENSE
Build-tools/mysql-copyright-2:
- replaced LICENSE with MySQLEULA.txt
Build-tools/mysql-copyright:
- use "tar" instead of "gtar"
- replaced LICENSE with MySQLEULA.txt
configure.in:
- Bumped up version number to 3.23.54 now that 3.23.53 has been
tagged
scripts/make_binary_distribution.sh:
- replaced LICENSE with MySQLEULA.txt
common, especially on our main build systems
- cosmetical fix in mysql.spec
Build-tools/mysql-copyright:
- rename gtar -> tar (more common on most systems)
support-files/mysql.spec.sh:
- fix non ASCII accent and replace it with something that does not
mess my syntax highlighting :)
with InnoDB support when requested to do so)
Build-tools/Do-compile:
- only build with InnoDB, if requested to do so (required to be able
to build 4.0 "Classic" packages without InnoDB support)
- Enhanced the failure report message subject a little
better documented
Build-tools/Do-compile:
- Removed some obsolete pieces of code (get rid of using rsh and rcp)
- Added some code comments
- Reworked help text to match the options available
- Heavily reworked GetOptions, removed some obsolete ones and joined others
- make_options and config_options can now be given multiple times
- simplified code that added configure options dependent on given options
better documented
- Added a note to manual.texi about using sysctl to tune Linux kernel
parameters, corrected a wrong path name
Build-tools/Do-compile:
- Removed some obsolete pieces of code (get rid of using rsh and rcp)
- Added some code comments
- Reworked help text to match the options available
- Heavily reworked GetOptions, removed some obsolete ones and joined others
- make_options and config_options can now be given multiple times
- simplified code that added configure options dependent on given options
Docs/manual.texi:
- Corrected location of boot.local init script on SuSE Linux
- Add a note about using sysctl and sysctl.conf for changing kernel
parameters
Build-tools/Do-compile:
- applied some modifications made in the 4.0 tree
- added option --make-options to pass options to "make" after configure
- added option --raid to enable RAID
- added option --libwrap to enable TCP wrapper support
- make sure to remove log files as early as possible
- fixed option --with-other-libc to actually work
- fixed some oddly-placed quotes in the configure call
Build-tools/Do-compile:
- actually add the with-other-libc option to the config options when set
- fixed some odd-placed quotation marks in the configure line
- fixed wording of two 4.0 features in manual.texi
Build-tools/Do-compile:
- Added "--libwrap" to enable building with TCP wrapper support
Docs/manual.texi:
- Fixed wording of two 4.0 features
- Added 4.0.4 News section and updated Alpha-Linux compilation notes
to manual.texi
- Tagged ChangeSet 1.1244.1.2 as mysql-4.0.3
Build-tools/Do-compile:
- Added --raid option to be able to build with MySQL RAID suppo
Docs/manual.texi:
- Updated compilation notes on Alpha-Linux
- Added 4.0.4 News section
- Added note about Sinisa's last fix (mostly only to have an item in the
news section)
Fixed hangup problem in net_clear() on HPUX and Windows.
Build-tools/Do-compile:
Added --bdb-max-lock=60000 option when testing BDB tables.
configure.in:
Fix for HPUX to not use -lc_r library.
vio/viosocket.c:
Fixed hangup problem in net_clear() on HPUX and Windows.
Removed compiler warnings.
Build-tools/Do-compile:
Simple cleanup
include/mysql.h:
Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
Documented test
Change to be runnable from mysql
sql/mini_client.cc:
Removed dead code
sql/mysqld.cc:
Changed relay_log_space to ulonglong
sql/slave.cc:
Changed relay_log_space to ulonglong
Removed dead code
sql/slave.h:
Changed relay_log_space to ulonglong
sql/sql_acl.cc:
Removed not used variables
sql/sql_base.cc:
Removed not used variables
sql/sql_cache.cc:
Removed not used variables
sql/sql_select.cc:
Removed not used variables
vio/vio.c:
Re-order include files to remove compiler warnings
Fix when using --localstatedir
Cleaned up mysql.server
Build-tools/Do-compile:
Remove test file timestamp2
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Portability fix
scripts/make_binary_distribution.sh:
Fix for mysql.server
sql/mysqld.cc:
Fix when using --localstatedir
support-files/mysql.server.sh:
More comments for usage of 'basedir'
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Build-tools/Do-compile:
Always run test with --warnings during build
Docs/manual.texi:
Changelog
configure.in:
Use our version of RWLOCKS on UNIXWARE 7
include/my_pthread.h:
Use our version of RWLOCKS on UNIXWARE 7
include/mysql_version.h.in:
Fixed warning when compiling embedded server
include/mysqld_error.h:
New error messages
libmysql/libmysql.c:
Give connect error message on reconnect if it fails.
Fixed possible buffer overflow in expand_error()
Added error messages for some error conditions.
mysql-test/mysql-test-run.sh:
Portability fixes:
- Search after 'time' in path.
- Search after mysqld in libexec
- Remove end / when doing rm -r (fix for BSD)
Clean up skip_test handling.
mysql-test/r/rpl_empty_master_crash.result:
New results
mysql-test/t/rpl_empty_master_crash.test:
Extended test
mysys/mf_iocache.c:
Remember file position on failed read.
mysys/mf_iocache2.c:
Fixed bug in filelength() call.
mysys/thr_alarm.c:
Made alarm handling more threadsafe when use with DBUG.
mysys/thr_mutex.c:
More debug info
sql/log_event.cc:
More DBUG_PRINT statements.
sql/mini_client.cc:
Better error reporting on failures.
Return connect error on reconnect failure (instead of SERVER_GONE_ERROR)
Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely)
sql/mysql_priv.h:
Fixed arguments to mysql_binlog_send()
sql/mysqld.cc:
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
sql/net_pkg.cc:
Removed dead code
sql/net_serv.cc:
Ensure that last_errno is set in net_real_write()
sql/repl_failsafe.cc:
Code cleanup.
Better error handling.
sql/share/czech/errmsg.txt:
New error messages.
sql/share/danish/errmsg.txt:
New error messages.
sql/share/dutch/errmsg.txt:
New error messages.
sql/share/english/errmsg.txt:
New error messages.
sql/share/estonian/errmsg.txt:
New error messages.
sql/share/french/errmsg.txt:
New error messages.
sql/share/german/errmsg.txt:
New error messages.
sql/share/greek/errmsg.txt:
New error messages.
sql/share/hungarian/errmsg.txt:
New error messages.
sql/share/italian/errmsg.txt:
New error messages.
sql/share/japanese/errmsg.txt:
New error messages.
sql/share/korean/errmsg.txt:
New error messages.
sql/share/norwegian-ny/errmsg.txt:
New error messages.
sql/share/norwegian/errmsg.txt:
New error messages.
sql/share/polish/errmsg.txt:
New error messages.
sql/share/portuguese/errmsg.txt:
New error messages.
mysql-test/r/rpl_log_pos.result:
Updated results
mysql-test/t/rpl_log_pos.test:
Added 'sleep' commands to make tests repeatable.
sql/share/romanian/errmsg.txt:
New error messages.
sql/share/russian/errmsg.txt:
New error messages.
sql/share/slovak/errmsg.txt:
New error messages.
sql/share/spanish/errmsg.txt:
New error messages.
sql/share/swedish/errmsg.txt:
New error messages.
sql/share/ukrainian/errmsg.txt:
New error messages.
sql/slave.cc:
Code optimization and cleanup.
More DBUG statements.
Better cleanup if start slave fails.
Better error messages from 'fetch_master_table'
Thread safer handling of 'wait_for_pos'
sql/slave.h:
Better handling of wait_for_pos
sql/sql_load.cc:
Removed warning when setting an AUTO_INCREMENT field to NULL
sql/sql_parse.cc:
Fixed calling of function that has changed.
sql/sql_repl.cc:
More DBUG statements
Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
BitKeeper/deleted/.del-set_var.cc~5374527de1955359:
Delete: libmysqld/set_var.cc
BitKeeper/etc/ignore:
added libmysqld/set_var.cc
Build-tools/Do-compile:
Remove warnings from touch during compilation
Docs/manual.texi:
Changelog
client/mysqltest.c:
Added real_sleep command
configure.in:
Fixed type for HPUX10
innobase/configure.in:
Fixed type for openbsd
libmysql/libmysql.c:
Fix for new SHOW SLAVE STATUS
myisam/mi_update.c:
Update key file if using external locking
mysql-test/mysql-test-run.sh:
Safety fix
mysql-test/r/rpl000015.result:
Update for new SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
Update for new SHOW SLAVE STATUS
mysql-test/t/rpl000001.test:
sleep -> real_sleep to avoid timing problem
sql/mysqld.cc:
Fixed bug with SIGTERM on Solaris
sql/slave.cc:
SHOW SLAVE STATUS returns empty sets if slave is not initialized.
sql/sql_repl.cc:
SHOW MASTER STAT returns empty set if no binary logging.
Don't update MyISAM index file on UPDATE if index is not changed
Build-tools/Do-compile:
Remove log files as early as possible
Docs/manual.texi:
Changelog
BitKeeper/etc/ignore:
Added myisam/test2.MYD myisam/test2.MYI to the ignore list
include/my_semaphore.h:
Portability fix for SCO and BSDI
innobase/configure.in:
Don't use inline with openbsd as this cases linker problems.
myisam/mi_update.c:
Don't update index file on UPDATE if index is not changed
mysys/my_pthread.c:
Portability fix for hpux
sql/item_cmpfunc.cc:
Don't convert bigint to bigint
InnoDB has been selected (InnoDB is now part of the normal binary,
not the Max binary)
Build-tools/Do-compile:
- InnoDB is now part of the default binary, no need to add the -max
suffix in this case
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names
Build-tools/Do-compile:
Added option --make-options
Docs/manual.texi:
Changelog
Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
Update for running gcc 3.x on HPUX
client/mysql.cc:
Portability fix
client/mysqlbinlog.cc:
Fix for using gcc 3.1
configure.in:
Fix for using gcc 3.1
include/my_global.h:
Fix for using gcc 3.1
include/my_pthread.h:
Removed warning on HPUX
innobase/configure.in:
Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
Test of new functions
mysql-test/r/rpl_get_lock.result:
Test of new functions
mysql-test/t/func_test.test:
Test of new functions
mysql-test/t/rpl_get_lock.test:
Test of new functions
mysys/my_tempnam.c:
Portability fix
sql/item_cmpfunc.cc:
Added comments to Item_cond_xor.
Fixed NULL handling for XOR
sql/item_create.cc:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
Cleanup XOR handling
sql/item_func.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
Moved chroot() to be exectued earlier.
sql/sql_db.cc:
Apply lower_case_table_names also to databases
sql/sql_parse.cc:
Apply lower_case_table_names also to databases
sql/sql_select.cc:
Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
Don't allow \ in database names
header in x86 assemler files instead of eating the whole file
Build-tools/mysql-copyright-2:
Handle copyright headers in *-x86.s files correctly (they do not
use C style comments)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
Auto merged
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/array.c:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/raid.cc:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/Makefile.am:
Auto merged
Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists
Build-tools/Do-linux-build:
Only use the "--with-other-libc" parameter, if another libc actually
exists at this location
Makefile.am:
Removed hard-coded tar binary name
configure.in:
Added check for GNU tar with various names
sql/sql_yacc.yy:
Added semicolons to several expressions to make bison 1.31 and above
happy when used in Yacc compatibility mode. From the bison NEWS:
"Bison has always permitted actions such as { $$ = $1 }: it adds the
ending semicolon. Now if in Yacc compatibility mode, the semicolon
is no longer output: one has to write { $$ = $1; }."
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
build scripts work again.
BUILD/compile-pentium-max:
Added "--with-embedded-server" to have the libmysqld files included
in the source distribution when using "make dist"
Build-tools/Do-linux-build:
Only use the "--with-other-libc" parameter, if another libc actually
exists, since this will also force static linking, which does not work
together with OpenSSL
Makefile.am:
Removed hard-coded file name for TAR, let configure do this instead
(many systems actually ship GNU tar installed as "tar" instead of
"gtar")
configure.in:
Added check for GNU tar named "gtar", fall back to "tar" if "gtar"
was not found (and hope, that it's a GNU tar as well - this should
probably be checked more properly)
include/Makefile.am:
Added "my_semaphore.h" to pkginclude_HEADERS since it was missing
from the distribution
strings/Makefile.am:
Added "longlong2str.c" since it was missing from the distribution
support-files/mysql.server.sh:
Added LSB-compatible header info to make init script more portable
support-files/mysql.spec.sh:
- Use more RPM macros (e.g. infodir, mandir) to make the spec
file more portable
- reorganized the installation of documentation files: let RPM
take care of this
- reorganized the file list: actually install man pages along
with the binaries of the respective subpackage
- don't include libmysqld.a in the devel subpackage as well, if we
have a special "embedded" subpackage
- reworked the package descriptions
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysqldumpslow.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/Makefile.am:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Docs/manual.texi:
merge
client/mysql.cc:
merge
client/mysqldump.c:
merge
innobase/buf/buf0buf.c:
merge
innobase/os/os0file.c:
merge
innobase/row/row0mysql.c:
merge
mysql-test/r/range.result:
merge
sql/ha_innodb.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/sql_base.cc:
merge
sql/sql_load.cc:
merge
Build-tools/Do-compile:
Fix to build mysqlcom
Build-tools/Do-rpm:
Fixes for building with gcc 3.0.4
Docs/manual.texi:
Small bug fix
configure.in:
Cleanup
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
strings/Makefile.am:
Auto merged
Build-tools/Do-compile:
Fixed typo
Docs/manual.texi:
Changelog
mysql-test/r/type_date.result:
Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
Fix for RAID files
sql/table.cc:
Fixed typo in last patch
Build-tools/Do-all-build-steps:
pass parameters to Do-rpm
Build-tools/Do-compile:
with-other-libc option
Build-tools/Do-rpm:
make it "automagically" work on SuSE as well as RedHat
strings/Makefile.am:
added t_ctype.h to the distribution for now - permanent fix to come later
support-files/mysql.spec.sh:
changed build to use --with-other-libc
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-alpha:
Auto merged
BUILD/compile-pentium-gcov:
Auto merged
BUILD/compile-pentium-gprof:
Auto merged
BUILD/compile-pentium:
Auto merged
BitKeeper/deleted/.del-my_new.cc:
Delete: mysys/my_new.cc
Build-tools/Do-compile:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
bdb/dist/configure.in:
Auto merged
client/Makefile.am:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/my_lock.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
support-files/my-medium.cnf.sh:
Auto merged
support-files/my-small.cnf.sh:
Auto merged
configure.in:
merge
innobase/row/row0mysql.c:
merge
innobase/trx/trx0trx.c:
merge
mysql-test/r/innodb.result:
merge
mysql-test/r/join.result:
merge
sql/ha_innodb.cc:
merge
sql/slave.cc:
merge
