diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 65 |
6 files changed, 66 insertions, 14 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index f670adb460c..5be8f5e67a0 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -112,6 +112,9 @@ server-id = 1 # # binary logging - not required for slaves, but recommended #log-bin=mysql-bin +# +# binary logging format - mixed recommended +#binlog_format=mixed # Point the following paths to different dedicated disks #tmpdir = /tmp/ diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index cc11ebfe63f..60b8138880e 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -191,6 +191,9 @@ tmp_table_size = 64M # the ability to do point in time recovery from your latest backup. log-bin=mysql-bin +# binary logging format - mixed recommended +binlog_format=mixed + # If you're using replication with chained slaves (A->B->C), you need to # enable this option on server B. It enables logging of updates done by # the slave thread into the slave's binary log. diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 2e3143ac449..0d5719e4438 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -53,6 +53,9 @@ skip-federated # binary logging is required for replication log-bin=mysql-bin +# binary logging format - mixed recommended +binlog_format=mixed + # required unique id between 1 and 2^32 - 1 # defaults to 1 if master-host is not set # but will not function as a master if omitted diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 10d3e74f619..211b8ed5e8e 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -51,6 +51,9 @@ skip-federated # binary logging is required for replication log-bin=mysql-bin +# binary logging format - mixed recommended +binlog_format=mixed + # required unique id between 1 and 2^32 - 1 # defaults to 1 if master-host is not set # but will not function as a master if omitted diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index cfaca64c293..11ad69f1f71 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -48,6 +48,9 @@ server-id = 1 # Uncomment the following if you want to log updates #log-bin=mysql-bin +# binary logging format - mixed recommended +#binlog_format=mixed + # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index f2b220cf53c..0a4afbb2698 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -32,11 +32,6 @@ %{?_with_cluster:%define CLUSTER_BUILD 1} %{!?_with_cluster:%define CLUSTER_BUILD 0} -# use "rpmbuild --with federated" or "rpm --define '_with_federated 1'" (for RPM 3.x) -# to build with federated support (off by default) -%{?_with_federated:%define FEDERATED_BUILD 1} -%{!?_with_federated:%define FEDERATED_BUILD 0} - # use "rpmbuild --with maria" or "rpm --define '_with_maria 1'" (for RPM 3.x) # to build with maria support (off by default) %{?_with_maria:%define MARIA_BUILD 1} @@ -336,8 +331,6 @@ mkdir -p $RBR%{_libdir}/mysql PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin} export PATH -# Build the Debug binary. - # Use gcc for C and C++ code (to avoid a dependency on libstdc++ and # including exceptions into the code if [ -z "$CXX" -a -z "$CC" ] @@ -346,16 +339,25 @@ then export CXX="gcc" fi +# Prepare compiler flags +CFLAGS=${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} +CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti } + ############################################################################## # # Build the debug version # ############################################################################## -# Strip -Oxxx, add -g and --with-debug. -(cd mysql-debug-%{mysql_version} && -CFLAGS=`echo "${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" | sed -e 's/-O[0-9]*//g'` \ -CXXFLAGS=`echo "${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" | sed -e 's/-O[0-9]*//g'` \ +( +# We are in a subshell, so we can modify variables just for one run. +CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` +CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` + +# Add -g and --with-debug. +cd mysql-debug-%{mysql_version} && +CFLAGS=\"$CFLAGS\" \ +CXXFLAGS=\"$CXXFLAGS\" \ BuildMySQL "--enable-shared \ --with-debug \ %if %{MARIA_BUILD} @@ -380,8 +382,8 @@ fi ############################################################################## (cd mysql-release-%{mysql_version} && -CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" \ -CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" \ +CFLAGS=\"$CFLAGS\" \ +CXXFLAGS=\"$CXXFLAGS\" \ BuildMySQL "--enable-shared \ --with-embedded-server \ %if %{MARIA_BUILD} @@ -448,6 +450,9 @@ install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql # Install embedded server library in the build root install -m 644 $MBD/libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ +# in RPMs, it is unlikely that anybody should use "sql-bench" +rm -fr $RBR%{_datadir}/sql-bench + # Create a symlink "rcmysql", pointing to the init.script. SuSE users # will appreciate that, as all services usually offer this. ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql @@ -639,6 +644,7 @@ fi %doc %attr(644, root, root) %{_infodir}/mysql.info* +%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* %doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* @@ -657,12 +663,14 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1* %doc %attr(644, root, man) %{_mandir}/man1/perror.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1* %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd +%attr(755, root, root) %{_bindir}/innochecksum %attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/myisam_ftdump %attr(755, root, root) %{_bindir}/myisamchk @@ -703,6 +711,7 @@ fi %attr(755, root, root) %{_bindir}/msql2mysql %attr(755, root, root) %{_bindir}/mysql %attr(755, root, root) %{_bindir}/mysql_find_rows +%attr(755, root, root) %{_bindir}/mysql_upgrade_shell %attr(755, root, root) %{_bindir}/mysql_waitpid %attr(755, root, root) %{_bindir}/mysqlaccess %attr(755, root, root) %{_bindir}/mysqladmin @@ -715,6 +724,7 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1* @@ -760,6 +770,8 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_print_backup_file.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_print_schema_file.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_print_sys_file.1* @@ -771,13 +783,14 @@ fi %files ndb-extra %defattr(-,root,root,0755) -%attr(755, root, root) %{_sbindir}/ndb_cpcd %attr(755, root, root) %{_bindir}/ndb_delete_all %attr(755, root, root) %{_bindir}/ndb_drop_index %attr(755, root, root) %{_bindir}/ndb_drop_table +%attr(755, root, root) %{_sbindir}/ndb_cpcd %doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1* %endif %files devel @@ -788,6 +801,7 @@ fi %dir %attr(755, root, root) %{_includedir}/mysql %dir %attr(755, root, root) %{_libdir}/mysql %{_includedir}/mysql/* +%{_datadir}/aclocal/mysql.m4 %{_libdir}/mysql/libdbug.a %{_libdir}/mysql/libheap.a %if %{have_libgcc} @@ -837,6 +851,29 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com> + +- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. + This should cover both gcc and icc flags. Fixes bug#40546. + +* Fri Aug 29 2008 Kent Boortz <kent@mysql.com> + +- Removed the "Federated" storage engine option, and enabled in all + +* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com> + +- Get rid of the "warning: Installed (but unpackaged) file(s) found:" + Some generated files aren't needed in RPMs: + - the "sql-bench/" subdirectory + Some files were missing: + - /usr/share/aclocal/mysql.m4 ("devel" subpackage) + - Manual "mysqlbug" ("server" subpackage) + - Program "innochecksum" and its manual ("server" subpackage) + - Manual "mysql_find_rows" ("client" subpackage) + - Script "mysql_upgrade_shell" ("client" subpackage) + - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage) + - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage) + * Mon Mar 31 2008 Kent Boortz <kent@mysql.com> - Made the "Federated" storage engine an option |