into trift-lap.fambruehe:/MySQL/M51/push-5.1
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
into debian.(none):/M51/push-5.1
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
mysql-test/t/sp_trans_log.test:
Similar changes in different trees - give main tree precedence.
not some other tool (file system checker on Tru64).
Patch originally supplied by Peter O'Gorman, slightly modified by me.
Bug#27739 "build fails on Tru64 due to icheck test in configure"
configure.in:
We use "icheck" as a tool to check against ABI changes.
However, some systems (like Tru64) have "icheck" as a file system checker.
So if "icheck" is found, it should be verified that this really is the
ABI checker and not some other tool.
Patch originally supplied by Peter O'Gorman, slightly modified by me.
Bug#27739 "build fails on Tru64 due to icheck test in configure"
into romeo.(none):/home/bk/merge-mysql-5.1
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_ndb_basic.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Makefile.am:
Removed debian/control creation from the top level dist-hook
configure.in:
Create debian/control from configure again
debian/rules:
Protect debian/control from the debuild distclean run.
Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769
Cleaned up some things to make building the packages go a little smoother.
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package.
---
Corrected incorrect variable name
---
Renamed template files to have shorter names.
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist.
debian/libmysqlclientSLIB-dev.README.Maintainer.in:
Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
debian/libmysqlclientSLIB-dev.dirs.in:
Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
debian/libmysqlclientSLIB-dev.docs.in:
Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
debian/libmysqlclientSLIB-dev.examples.in:
Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
debian/libmysqlclientSLIB-dev.files.in:
Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
debian/libmysqlclientSLIB-dev.links.in:
Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
debian/libmysqlclientSLIB.README.Debian.in:
Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
debian/libmysqlclientSLIB.dirs.in:
Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
debian/libmysqlclientSLIB.docs.in:
Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
debian/libmysqlclientSLIB.files.in:
Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
debian/libmysqlclientSLIB.postinst.in:
Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
debian/libndbclientNLIB-dev.dirs.in:
Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
debian/libndbclientNLIB-dev.files.in:
Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
debian/libndbclientNLIB-dev.links.in:
Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
debian/libndbclientNLIB.README.Debian.in:
Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
debian/libndbclientNLIB.dirs.in:
Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
debian/libndbclientNLIB.files.in:
Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
debian/libndbclientNLIB.postinst.in:
Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
debian/mysql-client-BASE.NEWS.in:
Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
debian/mysql-client-BASE.README.Debian.in:
Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
debian/mysql-client-BASE.dirs.in:
Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
debian/mysql-client-BASE.docs.in:
Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
debian/mysql-extra-BASE.dirs.in:
Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
debian/mysql-extra-BASE.files.in:
Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
debian/mysql-management-BASE.dirs.in:
Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
debian/mysql-management-BASE.files.in:
Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
debian/mysql-management-BASE.mysql-management.init.in:
Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
debian/mysql-server-BASE.NEWS.in:
Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
debian/mysql-server-BASE.README.Debian.in:
Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
debian/mysql-server-BASE.dirs.in:
Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
debian/mysql-server-BASE.docs.in:
Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
debian/mysql-server-BASE.links.in:
Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
debian/mysql-server-BASE.logcheck.ignore.server.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
debian/mysql-server-BASE.logcheck.ignore.workstation.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
debian/mysql-server-BASE.mysql-server.logrotate.in:
Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
debian/mysql-server-BASE.preinst.in:
Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
debian/mysql-server-BASE.prerm.in:
Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
debian/mysql-server-PREV.preinst.in:
Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
debian/mysql-storage-BASE.dirs.in:
Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
debian/mysql-storage-BASE.files.in:
Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
debian/mysql-storage-BASE.mysql-storage.init.in:
Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
debian/mysql-test-BASE.dirs.in:
Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
debian/mysql-test-BASE.files.in:
Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
debian/mysql-tools-BASE.dirs.in:
Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
debian/mysql-tools-BASE.files.in:
Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
Makefile.am:
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
Need to generate the control file in the dist dir - not the source dir.
configure.in:
Added variables to support the generation of debian/control and debian/defs.mk from configure
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
debian/Makefile.am:
Distribute the generated control file so that debuild will work naturally.
---
Broke the EXTRA_DIST line into separate lines.
Added defs.mk.in
---
Modified debian/Makefile to use the new shorter template file names.
debian/control.in:
Changed substitution variables to match already existing autoconf vars.
debian/defs.mk.in:
Changed substitution variables to match already existing autoconf vars.
Made defs.mk.in generated from template.
Persisted variables here.
---
Corrected incorrect variable name
debian/mysql-client-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-client-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.config.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postinst.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postrm.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.templates.in:
Changed substitution variables to match already existing autoconf vars.
debian/po/POTFILES.in.in:
Changed substitution variables to match already existing autoconf vars.
debian/rules:
BUG#27769 - MySQL should include debian packaging dir
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
Prevented the test suite from being run unless requested.
---
Needed a space between ifneq and (
---
The variable substitution was stepping on the Makefile from automake.
---
Left off the debian/ prefix to the Makefile filter.
---
Changed substitution variables to match already existing autoconf vars.
---
Save debian/defs.mk from make distclean
debian/source.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
into trift2.:/MySQL/M51/limit-man-5.1
Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
configure.in:
Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
also control the list of man pages installed, so that they correspond better to the binaries.
This is the second version of this fix, including review comments.
configure.in:
Several of our man pages are specific to parts (table handlers, features, ...)
which are controlled by "configure" options, so there are builds which do not
include these parts.
For such builds, remove those specific man pages from the list of man pages
to be installed, so that the man pages correspond better to the binaries.
In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB.
Ensure that the handling of the man pages is determined only after the options
have been processed, the old nandling (NDB only) was done too early.
This is the second version of this fix, including review comments.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
configure.in:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
Makefile.am:
Added debian dir to the DIST_SUBDIRS.
configure.in:
Merged changes from 5.0 for adding debian dir.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
---
Removed added manpages that aren't appropriate for our build.
---
Added debian dir to list of dist targets.
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
BitKeeper/deleted/.del-configure.in.rej:
Delete: configure.in.rej
Makefile.am:
Added debian dir to list of dist targets.
configure.in:
Added debian/Makefile to configure.in to support make dist
BitKeeper/deleted/.del-comp_err.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-msql2mysql.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-my_print_defaults.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisam_ftdump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamchk.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisampack.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_config.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_convert_table_format.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_explain_log.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_find_rows.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_fix_extensions.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_install_db.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_secure_installation.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_setpermission.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_tableinfo.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_waitpid.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbinlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbug.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlcheck.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqldumpslow.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlimport.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlmanager.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqltest.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-pack_isam.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolve_stack_dump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolveip.1:
Adding files to support building for debian.
debian/Makefile.am:
Added list of files needed to be distributed in debian dir.
debian/README.Maintainer:
Adding files to support building for debian.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
debian/changelog:
Adding files to support building for debian.
debian/compat:
Adding files to support building for debian.
debian/control.in:
Adding files to support building for debian.
debian/copyright.more:
Adding files to support building for debian.
debian/copyright:
Adding files to support building for debian.
debian/defs.mk:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.README.Maintainer.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.examples.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.links.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.postinst.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.links.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.postinst.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-common.README.Debian.in:
Adding files to support building for debian.
debian/mysql-common.dirs.in:
Adding files to support building for debian.
debian/mysql-common.files.in:
Adding files to support building for debian.
debian/mysql-common.postrm.in:
Adding files to support building for debian.
debian/mysql-common.preinst.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.mysql-management.init.in:
Adding files to support building for debian.
debian/mysql-server-MYOLDVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.config.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.links.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.paranoid.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.server.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.workstation.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.mysql-server.logrotate.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postrm.in:
Adding files to support building for debian.
debian/additions/my.cnf:
Adding files to support building for debian.
debian/additions/mysql-server.lintian-overrides:
Adding files to support building for debian.
debian/additions/ndb_mgmd.cnf:
Adding files to support building for debian.
debian/mysql-server-MYVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.prerm.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.templates.in:
Adding files to support building for debian.
debian/mysql-server.preinst.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.mysql-storage.init.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.files.in:
Adding files to support building for debian.
debian/po/POTFILES.in.in:
Adding files to support building for debian.
debian/po/ca.po:
Adding files to support building for debian.
debian/po/cs.po:
Adding files to support building for debian.
debian/po/da.po:
Adding files to support building for debian.
debian/po/de.po:
Adding files to support building for debian.
debian/po/es.po:
Adding files to support building for debian.
debian/po/eu.po:
Adding files to support building for debian.
debian/po/fr.po:
Adding files to support building for debian.
debian/po/gl.po:
Adding files to support building for debian.
debian/po/it.po:
Adding files to support building for debian.
debian/po/ja.po:
Adding files to support building for debian.
debian/po/nb.po:
Adding files to support building for debian.
debian/po/nl.po:
Adding files to support building for debian.
debian/po/pt.po:
Adding files to support building for debian.
debian/po/pt_BR.po:
Adding files to support building for debian.
debian/po/ro.po:
Adding files to support building for debian.
debian/po/ru.po:
Adding files to support building for debian.
debian/po/sv.po:
Adding files to support building for debian.
debian/po/templates.pot:
Adding files to support building for debian.
debian/po/tr.po:
Adding files to support building for debian.
debian/rules:
Adding files to support building for debian.
---
Added semi-colons to fix syntax error.
debian/source.lintian-overrides.in:
Adding files to support building for debian.
debian/watch:
Adding files to support building for debian.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
Makefile.am:
Always build the bundled zlib static only
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
config/ac-macros/zlib.m4:
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
scripts/make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
zlib/Makefile.am:
Always build the bundled zlib static only
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
- Move the link_sources command from top level Makefile into each subdir
that need to link files
BitKeeper/etc/ignore:
Added libmysqld/link_sources libmysql/link_sources include/link_sources client/link_sources to the ignore list
Makefile.am:
Move link_sources down into each sub directory that might need it
client/Makefile.am:
Add "link_sources" to BUILT_SOURCES
configure.in:
Move link_sources down into each sub directory that might need it
include/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.shared:
Add "link_sources" to BUILT_SOURCES
libmysqld/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysqld/examples/Makefile.am:
Add "link_sources" to BUILT_SOURCES
netware/Makefile.am:
Add "link_sources" to BUILT_SOURCES
sql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
configure.in:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
configure.in:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
Auto merged
VC++Files/mysys/mysys.dsp:
SCCS merged
This just reverses those changes. I'm really sorry about that.
configure.in, version.c:
Reverse last push (from mysql-5.2 into mysql-5.1)
configure.in:
Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
Reverse last push (from mysql-5.2 into mysql-5.1)
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.
Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.
Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
BitKeeper/deleted/.del-SETUP.sh.rej:
Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej
BitKeeper/deleted/.del-configure.in.rej:
Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej
BitKeeper/deleted/.del-my_global.h.rej:
Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej
BitKeeper/deleted/.del-my_pthread.h.rej:
Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej
BitKeeper/deleted/.del-mysql_client_test.c.rej:
Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej
BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89:
Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89
BitKeeper/deleted/.del-sql_parse.cc.rej:
Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej
BitKeeper/deleted/.del-table.cc.rej:
Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej
BitKeeper/deleted/.del-thr_alarm.c.rej:
Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej
BUILD/compile-pentium64:
Update this to be in line with compile-pentium
BUILD/compile-pentium:
Send command line options to SETUP.sh
BUILD/compile-solaris-sparc-debug:
Update scripts
BUILD/compile-solaris-sparc-forte:
Update scripts
BUILD/compile-solaris-sparc-purify:
Update scripts
BUILD/compile-solaris-sparc:
Update scripts
BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d:
Removed compiler warning
BitKeeper/deleted/.del-ha_berkeley.cc:
Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64
configure.in:
Added detection of port_create and port.h (for future)as
---
manual merge
BitKeeper/deleted/.del-ha_berkeley.h:
Moved get_auto_primary_key() to ha_berkeley.cc
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
Fixed compiler warnings
BitKeeper/etc/ignore:
added storage/ndb/src/ndbapi/ndberror_check
client/mysqlbinlog.cc:
Removed not needed 'static' (caused compiler warning)
client/mysqldump.c:
Fixed compiler warnings from 'max' build
client/mysqltest.c:
Free warning and query memory no abort.
(Removes strange warnings on screen if mysql-test-run fails)
Removed compiler warnings
Portability fix for windows (windows doesn't have mode_t)
client/sql_string.h:
Removed compiler warning
cmd-line-utils/readline/xmalloc.c:
Fixed compiler warnings from 'max' build
extra/charset2html.c:
Fixed compiler warnings
extra/comp_err.c:
Fixed compiler warnings from 'max' build
extra/yassl/include/lock.hpp:
Fix for windows64
extra/yassl/include/openssl/ssl.h:
Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
extra/yassl/include/socket_wrapper.hpp:
Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit
extra/yassl/include/yassl.hpp:
Fix for windows64
extra/yassl/src/ssl.cpp:
Removed compiler warning
Detect wrong parameter (Happens when running test suite on solaris)
Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
extra/yassl/taocrypt/src/integer.cpp:
Fixed compiler warnings
extra/yassl/testsuite/testsuite.cpp:
Removed compiler warning
include/config-win.h:
Added HAVE_WINSOCK2 (for future)
include/my_dbug.h:
Fixed DBUG_PROCESS() so that we don't get compiler warnings for it
include/my_global.h:
Fixed unsafe define of uint4korr()
manual merge (ignore changes from 5.0)
Fixed warnings on win64 when using int5store and int6store
include/my_pthread.h:
Added my_thread_id typedef
Renamed 'my_thread_id() function to my_thead_dbug_id()
include/thr_alarm.h:
Make thr_alarm_kill() to depend on thread_id instead of thread
include/thr_lock.h:
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
libmysql/libmysql.def:
Fixed compiler warnings on win64
libmysqld/CMakeLists.txt:
Added missing files
libmysqld/Makefile.am:
Added new files
libmysqld/lib_sql.cc:
Remove not needed code (store_globals() now takes care of things)
mysql-test/lib/mtr_report.pl:
Removed wrong messages when using --extern
mysql-test/mysql-test-run.pl:
Fixed that --extern works
Print help on stdout instead of stderr (make it easier to pipe it to less)
Fixed typo that caused mysql-test-run.pl to fail on Solaris
mysql-test/r/keywords.result:
manual merge
mysql-test/r/ndb_lock.result:
After merge fixes
mysql-test/r/ps.result:
Portability fix
mysql-test/t/disabled.def:
Disabled ndb_alter_table as this very often fails for me (and have done it for a long time)
mysql-test/t/keywords.test:
manual merge
mysql-test/t/ndb_lock.test:
Added other possible error code
mysql-test/t/ps.test:
Portability fix (when compiling without DLOPEN)
mysql-test/t/wait_timeout.test:
Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts)
mysys/base64.c:
Fixed compiler warnings on win64
mysys/mf_keycache.c:
Fixed compiler warnings
mysys/my_getopt.c:
Fixed compiler warning
mysys/my_init.c:
Fixed compiler warning
Re-indented long comment
mysys/my_thr_init.c:
Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage)
Always generate my_thread_name() when using DBUG
Ensure mysys_var->pthread_self is set
Fixed compiler warnings
mysys/ptr_cmp.c:
Fixed compiler warnings from 'max' build
mysys/thr_alarm.c:
Change thr_alarm_kill() to use mysys_var->id instead of thread id
Fixed compiler warning on windows
mysys/thr_lock.c:
Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id
Add purecov statements around not tested code
Fixed compiler warnings
mysys/thr_mutex.c:
my_thread_id() -> my_thread_dbug_id()
server-tools/instance-manager/guardian.cc:
Fixed compiler warning
server-tools/instance-manager/instance.cc:
Fixed compiler warning
server-tools/instance-manager/mysql_connection.cc:
Fixed compiler warnings
server-tools/instance-manager/mysqlmanager.cc:
Fixed compiler warnings
sql/CMakeLists.txt:
Added missing files
sql/Makefile.am:
Added new files
sql/event_scheduler.cc:
Added pthread_exit() calls
Ensure DBUG_xxx calls are not made before my_thread_init()
Use common functions to set up thread handling
sql/field.h:
manual merge
sql/ha_ndbcluster.cc:
Removed some trivial 'current_thd' calls
sql/handler.cc:
Avoid warnings on KILL_CONNECTION
Don't print out null pointer with printf() (Causes crashes on Solaris)
sql/item.cc:
Fixed compiler warnings from 'max' build
sql/item_cmpfunc.cc:
After merge fixes
sql/item_func.cc:
Merge embedded and normal code usage
(GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t)
Fixed compiler warning
sql/item_strfunc.cc:
Fixed compiler warning
sql/item_timefunc.cc:
Fixed compiler warnings
sql/lock.cc:
Use (new) parameter to thr_abort_locks_for_thread()
sql/log.cc:
Fixed compiler warning
sql/log_event.cc:
Fixed compiler warnings about not used variable
sql/mysql_priv.h:
Remove TEST_NO_THREADS (not needed with new scheduler interface)
Added functions from sql_connect.cc and new functions from sql_parse.cc
sql/mysqld.cc:
Use thread_scheduler structure to dispatch calls (make code more dynamic)
Change --one-thread option to use thread_scheduler interface
Made ONE_THREAD option independent of DBUG_BUILD
--one-thread is now depricated. One should instead use '--thread-handling=no-threads'
Remove not used uname() function.
Split create_new_thread() into reusable sub functions.
Preliminary interface code for future thread_handling code.
Fixed compiler warnings
sql/parse_file.cc:
Don't send zero pointer to fn_format() (Causes crashes when using --debug)
sql/repl_failsafe.cc:
Setup pseudo_thread_id same way as other code
sql/set_var.cc:
Added variables 'thread_handling'
Prepare for future variable 'thread_pool_size'
Fixed compiler warnings
sql/set_var.h:
Fixed compiler warning
sql/slave.cc:
Setup pseudo_thread_id same way as other code
Removed not used signal mask
sql/sql_acl.cc:
Fixed compiler warnings from 'max' build
sql/sql_base.cc:
Fixed long comments
Normalized variable setup
Don't destroy value of thd->variables.pseduo_thread_id
More DBUG_PRINT()'s
More DBUG_ASSERT()'s
Fixed compiler warnings from 'max' build
sql/sql_class.cc:
Remove thd->real_id and thd->dbug_thread_id
Added DBUG_ASSERT()
Use thread_scheduler to signal threads to be killed.
In THD::store_globals(), set my_thread_var->id to be thd->thread_id.
Fixed compiler warnings
sql/sql_class.h:
Use 'my_thread_id' for internal thread id's
Remove not needed THD elements: block_signals and dbug_thread_id
Added 'thread_scheduler' scheduling extension element to THD
sql/sql_insert.cc:
After merge fixes
(This actually fixes a bug in old code when many connections are in use)
Setup pseudo_thread_id same way as other code
Removed not used signal mask
Initialize variable that may be used unitialized on error conditions (not fatal)
sql/sql_parse.cc:
Move connection related code to sql_connect.cc
Remove setting of signal mask (not needed)
Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug)
Added previous 'optional' element to reset_mgh()
Removed not needed DBUG_PRINT call
sql/sql_partition.cc:
Fixed compiler warnings
sql/sql_prepare.cc:
Removed not needed casts
Fixed compiler warnings from 'max' build
sql/sql_select.cc:
Fixed compiler warnings
sql-bench/bench-init.pl.sh:
Added --one-missing-tests
sql-bench/example:
Better example
sql-bench/run-all-tests.sh:
Added --only-missing-tests
sql-bench/test-insert.sh:
Fixed wrong estimate of update_with_key_prefix
sql/sql_show.cc:
Don't send pthread_kill() to threads to detect if they exists.
(Not that useful and causes problems with future thread_handling code)
Fixed compiler warnings
sql/sql_table.cc:
Simplify code
Fixed compiler warnings
sql/sql_test.cc:
Remove dbug_thread_id from test output
sql/sql_view.cc:
Don't send zero pointer to fn_format()
sql/tztime.cc:
Fixed compiler warning
sql/udf_example.def:
Fixed compiler warnings on win64
sql/unireg.cc:
Initialize variable that may be used unitialized on error conditions
storage/archive/archive_test.c:
Fixed compiler warnings
storage/archive/azio.c:
Fixed compiler warnings
storage/innobase/dict/dict0crea.c:
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0dict.c:
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0load.c:
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0mem.c:
Fixed compiler warnings detected on windows64
storage/innobase/eval/eval0proc.c:
Fixed compiler warnings detected on windows64
storage/innobase/handler/ha_innodb.cc:
Fixed compiler warnings detected on windows64
storage/innobase/include/ut0byte.ic:
Fixed compiler warnings on win64
storage/innobase/include/ut0ut.ic:
Fixed compiler warnings on win64
storage/innobase/mtr/mtr0log.c:
Fixed compiler warnings detected on windows64
storage/innobase/pars/pars0lex.l:
Fixed warnings on win64
storage/innobase/rem/rem0cmp.c:
Fixed compiler warnings detected on windows64
storage/innobase/row/row0mysql.c:
Fixed compiler warnings detected on windows64
storage/innobase/row/row0sel.c:
Fixed compiler warnings detected on windows64
storage/innobase/sync/sync0rw.c:
Fixed compiler warnings detected on windows64
storage/innobase/trx/trx0trx.c:
Fixed compiler warnings detected on windows64
storage/myisam/mi_log.c:
my_thread_id() -> my_thread_debug_id()
storage/myisam/mi_packrec.c:
Fixed compiler warnings detected on windows64
storage/myisam/myisamchk.c:
Fixed compiler warnings from 'max' build
storage/ndb/src/common/debugger/EventLogger.cpp:
Fixed compiler warnings
storage/ndb/src/common/util/ConfigValues.cpp:
Removed compiler warnings
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Removed compiler warnings
storage/ndb/src/cw/cpcd/CPCD.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/diskpage.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/ndbd_malloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Fixed compiler warnings
storage/ndb/src/mgmclient/main.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/SignalSender.cpp:
Fixed compiler warnings
storage/ndb/tools/restore/consumer_restore.cpp:
Fixed compiler warnings
strings/ctype-ucs2.c:
Fixed compiler warnings
strings/ctype-utf8.c:
Fixed compiler warnings
strings/decimal.c:
Fixed compiler warnings
strings/my_strchr.c:
Fixed conflict between function and prototype
support-files/compiler_warnings.supp:
Ignore warnings from sql_yacc.cc that are hard to remove
Ignore some not important warnings from windows 64 bit build
Suppress warnings from bdb and (for the moment) warnings from ndb
Suppress all warnings for all pushbuild platforms (should make all trees green)
vio/viosslfactories.c:
Added DBUG_PRINT
BUILD/compile-pentium64-max:
New BitKeeper file ``BUILD/compile-pentium64-max''
libmysqld/scheduler.cc:
New BitKeeper file ``libmysqld/scheduler.cc''
libmysqld/sql_connect.cc:
New BitKeeper file ``libmysqld/sql_connect.cc''
mysql-test/include/one_thread_per_connection.inc:
New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc''
mysql-test/r/no-threads.result:
New BitKeeper file ``mysql-test/r/no-threads.result''
mysql-test/r/one_thread_per_connection.require:
New BitKeeper file ``mysql-test/r/one_thread_per_connection.require''
mysql-test/t/no-threads-master.opt:
New BitKeeper file ``mysql-test/t/no-threads-master.opt''
mysql-test/t/no-threads.test:
New BitKeeper file ``mysql-test/t/no-threads.test''
sql/scheduler.cc:
New BitKeeper file ``sql/scheduler.cc''
sql/scheduler.h:
New BitKeeper file ``sql/scheduler.h''
sql/sql_connect.cc:
New BitKeeper file ``sql/sql_connect.cc''
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Manual merge (Fix shadowed variable name)
extra/yassl/taocrypt/test/test.cpp:
No changes
ndb/src/common/util/ConfigValues.cpp:
Manual merge (Fix shadowed variable name)
sql/field.h:
manual merge
sql/ha_myisam.cc:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_cmpfunc.cc:
manual merge
sql/item_subselect.cc:
Manual merge (Fix shadowed variable name)
sql/mysqld.cc:
no changes
