- Correct PushBuild failure.
win/Makefile.am:
Bug#24732 Executables do not include Vista manifests
- Make sure new files are included in make dist builds.
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
BitKeeper/etc/ignore:
Bug#24732 Executables do not include Vista manifests
- Revise ignore rules to disallow auto-generated cmake files but to allow
custom macros defined in a .cmake file.
CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myTest executable.
myisam/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myisam executables.
server-tools/instance-manager/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqld executable.
win/README:
Bug#24732 Executables do not include Vista manifests
- Added new configuration option documentation.
win/configure.js:
Bug#24732 Executables do not include Vista manifests
- Added new EMBED_MANIFESTS configuration option.
win/create_manifest.js:
Bug#24732 Executables do not include Vista manifests
- Manifest generator. This script generates a basic manifest.
win/mysql_manifest.cmake:
Bug#24732 Executables do not include Vista manifests
- Define new CMake MACRO for adding Windows manifests to executables.
Fix "make distcheck"
scripts/CMakeLists.txt:
Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
Add "name of struct" as first arg to comp_sql
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
client/mysql_upgrade.c:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
Renamed packages back to libmysqlclientSLIBoff to match current packages.
We can rename this in a sensible way later on.
libmysqlclientSLIBoff.files.in:
Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
debian/libmysqlclientSLIBoff.README.Debian.in:
Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
debian/libmysqlclientSLIBoff.dirs.in:
Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
debian/libmysqlclientSLIBoff.docs.in:
Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
debian/libmysqlclientSLIBoff.files.in:
Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
debian/libmysqlclientSLIBoff.postinst.in:
Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
debian/control.in:
Renamed packages back to libmysqlclientSLIBoff to match current packages.
We can rename this in a sensible way later on.
Fix test case: add drop table
mysql-test/t/innodb_mysql.test:
Fix test case: add drop table
mysql-test/r/innodb_mysql.result:
Fix test case: add drop table
errno
Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.
Instead, capture the return value, which is the real error value,
and instead report that.
mysys/my_thr_init.c:
pthread functions don't set the global errno, which should be
obvious.
Fixed branding problem.
Many files:
Fixed branding problem
changelog:
Upgraded to 5.0.42
defs.mk.in:
Fixed branding and variable persiting problem.
debian/changelog:
Upgraded to 5.0.42
debian/control.in:
Fixed branding problem.
debian/defs.mk.in:
Fixed branding and variable persiting problem.
debian/mysql-client-BASE.files.in:
Fixed branding problem
debian/mysql-client-BASE.lintian-overrides.in:
Fixed branding problem
debian/mysql-server-BASE.config.in:
Fixed branding problem
debian/mysql-server-BASE.files.in:
Fixed branding problem
debian/mysql-server-BASE.lintian-overrides.in:
Fixed branding problem
debian/mysql-server-BASE.postinst.in:
Fixed branding problem
debian/mysql-server-BASE.postrm.in:
Fixed branding problem
debian/mysql-server-BASE.templates.in:
Fixed branding problem
debian/rules:
Fixed branding problem
debian/source.lintian-overrides.in:
Fixed branding problem
debian/po/POTFILES.in.in:
Fixed branding problem
Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
mysql-test/r/innodb_mysql.result:
Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
mysql-test/t/innodb_mysql.test:
Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
client/mysql_upgrade.c:
Add defines for WEXITSTATUS
Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
is used on all platforms.
mysql-test/t/mysql_upgrade.test:
When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
is used on all platforms.
scripts/comp_sql.c:
Some compilers have a max string length, insert a newline at
every 512th char in long strings
client/mysql_upgrade.c:
Windows fix
scripts/CMakeLists.txt:
Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
Improve comp_sql.c to generate output file with shorter strings
into mysql.com:/home/ram/work/b22824/my50-b22824
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/strict.result:
merging
mysql-test/t/strict.test:
merging
NULL MERGE: this ChangeSet will be null merged into mysql-5.1
Fixes:
- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
Report the current value of the AUTO_INCREMENT counter to MySQL.
innobase/configure.in:
Apply innodb-5.0-ss1405 snapshot
Revision r1396:
branches/5.0: Merge r1395 from trunk:
* Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
to set this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
* Add support for skipping the OS caching on Solaris by calling directio()
instead of fcntl().
innobase/os/os0file.c:
Apply innodb-5.0-ss1405 snapshot
Revision r1394:
branches/5.0: Merge r1391 from trunk:
Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
into a generic function which is called from both os_file_handle_error() and
os_file_handle_error_no_exit()
Revision r1396:
branches/5.0: Merge r1395 from trunk:
* Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
to set this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
* Add support for skipping the OS caching on Solaris by calling directio()
instead of fcntl().
mysql-test/r/innodb.result:
Apply innodb-5.0-ss1405 snapshot
Revision r1405:
branches/5.0: Merge r1404 from trunk:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
mysql-test/t/innodb.test:
Apply innodb-5.0-ss1405 snapshot
Revision r1405:
branches/5.0: Merge r1404 from trunk:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
sql/ha_innodb.cc:
Apply innodb-5.0-ss1405 snapshot
Revision r1405:
branches/5.0: Merge r1404 from trunk:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
sql/ha_innodb.h:
Apply innodb-5.0-ss1405 snapshot
Revision r1405:
branches/5.0: Merge r1404 from trunk:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
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
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
