3390 Alexander Nozdrin 2010-11-24 [merge]
Merge from mysql-5.5-bugteam.
modified:
CMakeLists.txt
libmysql/conf_to_src.c
libmysql/errmsg.c
libmysql/get_password.c
libmysql/libmysql.c
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
support-files/mysql.spec.sh
3389 Alfranio Correia 2010-11-23 [merge]
manual-merge mysql-trunk --> mysql-trunk-bugfixing
Resolved the following conflicts:
. mysql-test/collections/default.experimental
. mysql-test/suite/rpl/t/rpl_change_master.test
. sql/Makefile.am
. sql/sql_parse.cc
added:
mysql-test/extra/rpl_tests/rpl_change_master.test
mysql-test/extra/rpl_tests/rpl_crash_safe.inc
mysql-test/extra/rpl_tests/rpl_crash_safe.test
mysql-test/include/not_master_info_table.inc
mysql-test/include/not_relay_log_info_table.inc
mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
mysql-test/suite/rpl/r/rpl_row_crash_safe.result
mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
mysql-test/suite/rpl/t/rpl_change_master_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_change_master_crash_safe.test
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test
mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_row_crash_safe.test
mysql-test/suite/rpl/t/rpl_stm_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_stm_crash_safe.test
sql/rpl_info_table.cc
sql/rpl_info_table.h
sql/rpl_info_table_access.cc
sql/rpl_info_table_access.h
sql/rpl_info_values.cc
sql/rpl_info_values.h
modified:
client/mysqldump.c
mysql-test/collections/default.experimental
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/r/1st.result
mysql-test/r/connect.result
mysql-test/r/information_schema.result
mysql-test/r/log_tables.result
mysql-test/r/log_tables_upgrade.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysql_upgrade_ssl.result
mysql-test/r/mysqlcheck.result
mysql-test/r/system_mysql_db.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_key_column_usage.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
mysql-test/suite/rpl/r/rpl_change_master.result
mysql-test/suite/rpl/t/rpl_change_master.test
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
mysql-test/suite/rpl/t/rpl_show_master_info_file.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_sync.test
mysql-test/suite/sys_vars/t/master_info_repository_basic.test
mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/lock.cc
sql/log_event.cc
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_info_factory.h
sql/rpl_info_file.cc
sql/rpl_info_file.h
sql/rpl_info_handler.cc
sql/rpl_info_handler.h
sql/rpl_rli.h
sql/rpl_slave.cc
sql/rpl_slave.h
sql/server_ids.h
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_base.h
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_parse.cc
sql/sql_parse.h
sql/sys_vars.cc
sql/table.cc
sql/table.h
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt 2010-11-19 13:59:45 +0000
+++ b/CMakeLists.txt 2010-11-24 10:35:06 +0000
@@ -348,7 +348,7 @@ ENDIF()
# RPM installs documentation directly from the source tree
#
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql
+ INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
COMPONENT Readme
OPTIONAL
=== 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/errmsg.c'
--- a/libmysql/errmsg.c 2010-08-09 08:32:50 +0000
+++ b/libmysql/errmsg.c 2010-11-24 10:23:44 +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 2010-07-15 11:13:30 +0000
+++ b/libmysql/get_password.c 2010-11-24 10:23:44 +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-16 09:45:07 +0000
+++ b/libmysql/libmysql.c 2010-11-24 10:23:44 +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 'scripts/make_binary_distribution.sh'
--- a/scripts/make_binary_distribution.sh 2010-07-15 13:47:50 +0000
+++ b/scripts/make_binary_distribution.sh 2010-11-24 10:23:44 +0000
@@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scri
# 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
=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist 2010-10-27 10:28:09 +0000
+++ b/scripts/make_win_bin_dist 2010-11-24 10:35:06 +0000
@@ -183,8 +183,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-11-21 13:48:44 +0000
+++ b/support-files/mysql.spec.sh 2010-11-24 10:35:06 +0000
@@ -211,7 +211,6 @@
%define license_files_server %{src_dir}/LICENSE.mysql
%define license_type Commercial
%else
-%define license_files_devel %{src_dir}/EXCEPTIONS-CLIENT
%define license_files_server %{src_dir}/COPYING %{src_dir}/README
%define license_type GPL
%endif
@@ -1037,9 +1036,6 @@ echo "====="
# ----------------------------------------------------------------------------
%files -n MySQL-devel%{product_suffix} -f optional-files-devel
%defattr(-, root, root, 0755)
-%if %{defined license_files_devel}
-%doc %{license_files_devel}
-%endif
%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
%attr(755, root, root) %{_bindir}/mysql_config
@@ -1099,6 +1095,10 @@ echo "====="
- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@stripped>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
+
* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@stripped>
- Change the behaviour on installation and upgrade:
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3389 to 3390) | Alexander Nozdrin | 24 Nov |
