From: Alexander Nozdrin Date: November 24 2010 10:16am Subject: bzr push into mysql-5.1-bugteam branch (alexander.nozdrin:3516 to 3517) List-Archive: http://lists.mysql.com/commits/124825 Message-Id: <201011241017.oANLoXv8032564@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3517 Alexander Nozdrin 2010-11-24 [merge] Merge from mysql-5.0-bugteam. modified: Makefile.am libmysql/Makefile.am libmysql/Makefile.shared libmysql/conf_to_src.c libmysql/dll.c libmysql/errmsg.c libmysql/get_password.c libmysql/libmysql.c libmysql/manager.c libmysql_r/Makefile.am scripts/make_binary_distribution.sh scripts/make_win_bin_dist support-files/mysql.spec.sh 3516 Sergey Glukhov 2010-11-23 Bug#56862 Execution of a query that uses index merge returns a wrong result In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates temporary file where is stores row ids which meet QUICK_SELECT ranges except of clustered pk range, clustered range is processed separately. In init_read_record we check if temporary file is used and choose appropriate record access method. It does not take into account that temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT with clustered pk range. The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used. @ mysql-test/suite/innodb/r/innodb_mysql.result test case @ mysql-test/suite/innodb/t/innodb_mysql.test test case @ mysql-test/suite/innodb_plugin/r/innodb_mysql.result test case @ mysql-test/suite/innodb_plugin/t/innodb_mysql.test test case @ sql/opt_range.h added new method @ sql/records.cc The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used. modified: mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/innodb_plugin/r/innodb_mysql.result mysql-test/suite/innodb_plugin/t/innodb_mysql.test sql/opt_range.h sql/records.cc === modified file 'Makefile.am' --- a/Makefile.am 2010-11-09 14:45:13 +0000 +++ b/Makefile.am 2010-11-24 10:07:37 +0000 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + README COPYING CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ === modified file 'libmysql/Makefile.am' --- a/libmysql/Makefile.am 2009-07-08 14:49:45 +0000 +++ b/libmysql/Makefile.am 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ # published by the Free Software Foundation. # # There are special exceptions to the terms and conditions of the GPL as it -# is applied to this software. View the full text of the exception in file -# EXCEPTIONS-CLIENT in the directory of this software distribution. +# is applied to this software. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/Makefile.shared' --- a/libmysql/Makefile.shared 2010-07-02 18:30:47 +0000 +++ b/libmysql/Makefile.shared 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ # published by the Free Software Foundation. # # There are special exceptions to the terms and conditions of the GPL as it -# is applied to this software. View the full text of the exception in file -# EXCEPTIONS-CLIENT in the directory of this software distribution. +# is applied to this software. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/conf_to_src.c' --- a/libmysql/conf_to_src.c 2004-08-18 17:57:55 +0000 +++ b/libmysql/conf_to_src.c 2010-11-24 09:53:39 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/dll.c' --- a/libmysql/dll.c 2008-09-01 21:51:54 +0000 +++ b/libmysql/dll.c 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/errmsg.c' --- a/libmysql/errmsg.c 2008-05-20 16:36:26 +0000 +++ b/libmysql/errmsg.c 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/get_password.c' --- a/libmysql/get_password.c 2008-02-19 17:45:11 +0000 +++ b/libmysql/get_password.c 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/libmysql.c' --- a/libmysql/libmysql.c 2010-11-10 21:14:47 +0000 +++ b/libmysql/libmysql.c 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/manager.c' --- a/libmysql/manager.c 2009-02-13 16:41:47 +0000 +++ b/libmysql/manager.c 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql_r/Makefile.am' --- a/libmysql_r/Makefile.am 2007-10-08 18:55:44 +0000 +++ b/libmysql_r/Makefile.am 2010-11-24 10:07:37 +0000 @@ -5,8 +5,7 @@ # published by the Free Software Foundation. # # There are special exceptions to the terms and conditions of the GPL as it -# is applied to this software. View the full text of the exception in file -# EXCEPTIONS-CLIENT in the directory of this software distribution. +# is applied to this software. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'scripts/make_binary_distribution.sh' --- a/scripts/make_binary_distribution.sh 2010-06-17 17:55:21 +0000 +++ b/scripts/make_binary_distribution.sh 2010-11-24 10:07:37 +0000 @@ -302,8 +302,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; t # Copy readme and license files cp README Docs/INSTALL-BINARY $DEST/ - if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then - cp COPYING EXCEPTIONS-CLIENT $DEST/ + if [ -f COPYING ] ; then + cp COPYING $DEST/ elif [ -f LICENSE.mysql ] ; then cp LICENSE.mysql $DEST/ else @@ -381,7 +381,7 @@ copyfileto() copyfileto $BASE/docs ChangeLog Docs/mysql.info copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - EXCEPTIONS-CLIENT LICENSE.mysql + LICENSE.mysql # Non platform-specific bin dir files: BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ === modified file 'scripts/make_win_bin_dist' --- a/scripts/make_win_bin_dist 2010-08-24 13:48:45 +0000 +++ b/scripts/make_win_bin_dist 2010-11-24 10:07:37 +0000 @@ -187,8 +187,8 @@ cp ChangeLog $DESTDIR/Docs/ cp support-files/my-*.ini $DESTDIR/ if [ -f COPYING ] ; then - cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ - cp COPYING $DESTDIR/Docs/ + cp COPYING $DESTDIR/ + cp COPYING $DESTDIR/Docs/ fi # ---------------------------------------------------------------------- === modified file 'support-files/mysql.spec.sh' --- a/support-files/mysql.spec.sh 2010-06-15 20:27:48 +0000 +++ b/support-files/mysql.spec.sh 2010-11-24 10:07:37 +0000 @@ -1063,7 +1063,6 @@ fi %files devel %defattr(-, root, root, 0755) -%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %attr(755, root, root) %{_bindir}/mysql_config %dir %attr(755, root, root) %{_includedir}/mysql @@ -1134,6 +1133,10 @@ fi ############################################################################## %changelog +* Wed Nov 24 2010 Alexander Nozdrin + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too. + * Tue Jun 15 2010 Joerg Bruehe - Change the behaviour on upgrade: No bundle (reason: useless for push emails).