Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at Mon Oct 3 20:00:42 CEST 2011.
-------- --- openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2011-09-23 02:14:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-community-server/mysql-community-server.changes 2011-10-02 17:20:16.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Oct 2 15:38:26 CEST 2011 - mhruse...@suse.cz + +- updated to 5.5.16, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-16.html + +------------------------------------------------------------------- +Sun Oct 2 13:42:43 CEST 2011 - mhruse...@suse.cz + +- passing correct types to add_plugin (fixes arm build) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mysql-5.5.15.tar.bz2 New: ---- mysql-5.5.15-arm.patch mysql-5.5.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.CBjpNe/_old 2011-10-03 20:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.CBjpNe/_new 2011-10-03 20:00:38.000000000 +0200 @@ -32,9 +32,9 @@ Name: mysql-community-server Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.5.15 -%define srv_vers 5.5.15 +Version: 5.5.16 Release: 1 +%define srv_vers 5.5.16 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com @@ -52,13 +52,14 @@ Source12: series Source13: default_plugins.cnf Source14: old-ssl.series +Patch1: mysql-5.5.15-arm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils %else -#PreReq: /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd +PreReq: /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd %endif -#PreReq: coreutils sed grep +PreReq: coreutils sed grep %if 0%{?suse_version} PreReq: %install_info_prereq %insserv_prereq %endif @@ -119,6 +120,7 @@ %if 0%{?prefered} > 0 #------------------------------------------------------------------------------- + %package -n libmysqlclient-devel #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 @@ -166,6 +168,7 @@ %endif #------------------------------------------------------------------------------- + %package -n libmysqlclient18 #------------------------------------------------------------------------------- Summary: MySQL Shared Libraries @@ -241,8 +244,10 @@ #------------------------------------------------------------------------------- %if %{defined mdkversion} + %package debuging %else + %package debug %endif #------------------------------------------------------------------------------- @@ -255,9 +260,13 @@ Conflicts: otherproviders(mysql-debug) %if %{defined mdkversion} + %description debuging + %else + %description debug + %endif A version of the mysql server that has some debug code turned on. It should be only used to track down problems with the standard @@ -270,8 +279,8 @@ Michael Widenius <mo...@mysql.com> David Axmark <dav...@mysql.com> - #------------------------------------------------------------------------------- + %package test #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -384,6 +393,7 @@ %endif #------------------------------------------------------------------------------- + %prep #------------------------------------------------------------------------------- %setup -q -n mysql-%version -D -a 9 @@ -394,6 +404,7 @@ mysql-patches/tools/apply-series.sh "%{S:12}" # remove unneeded manpages ('make install' basically installs everything under # man/*) +%patch1 rm -f man/mysqlman.1 # dummy fallback manpage rm -f man/mysql.server.1 # init script, not installed in our rpm rm -f man/make_win_*.1 # windows build scripts @@ -405,24 +416,28 @@ sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh #------------------------------------------------------------------------------- + %build #------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/build.inc)} #------------------------------------------------------------------------------- + %install #------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/install.inc)} #------------------------------------------------------------------------------- + %pre #------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : -/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ +/usr/sbin/useradd -r -o -g mysql -c "MySQL database admin" \ -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || : /usr/sbin/usermod -g mysql -s /bin/false mysql || : #------------------------------------------------------------------------------- + %preun #------------------------------------------------------------------------------- [ $1 = 1 ] || /usr/sbin/rcmysql stop @@ -444,6 +459,7 @@ fi #------------------------------------------------------------------------------- + %posttrans #------------------------------------------------------------------------------- %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* @@ -460,45 +476,23 @@ rmdir /var/run/mysql/restart || : fi -#------------------------------------------------------------------------------- -%post -n libmysqlclient18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- +%post -n libmysqlclient18 -p /sbin/ldconfig -#------------------------------------------------------------------------------- -%postun -n libmysqlclient18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- +%postun -n libmysqlclient18 -p /sbin/ldconfig -#------------------------------------------------------------------------------- -%post -n libmysqlclient_r18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- +%post -n libmysqlclient_r18 -p /sbin/ldconfig -#------------------------------------------------------------------------------- -%postun -n libmysqlclient_r18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- +%postun -n libmysqlclient_r18 -p /sbin/ldconfig %if 0%{prefered} > 0 -#------------------------------------------------------------------------------- -%post -n libmysqld18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -%postun -n libmysqld18 -#------------------------------------------------------------------------------- -/sbin/ldconfig -#------------------------------------------------------------------------------- +%post -n libmysqld18 -p /sbin/ldconfig + +%postun -n libmysqld18 -p /sbin/ldconfig %endif #------------------------------------------------------------------------------- + %postun #------------------------------------------------------------------------------- if [ $1 = 0 ]; then @@ -508,12 +502,14 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %clean #------------------------------------------------------------------------------- [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -f mysql.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -535,6 +531,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files client -f mysql-client.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -543,6 +540,7 @@ %if 0%{prefered} > 0 #------------------------------------------------------------------------------- + %files -n libmysqlclient-devel -f libmysqlclient-devel.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -553,6 +551,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqld-devel #------------------------------------------------------------------------------- %defattr(-,root,root) @@ -561,6 +560,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqld18 #------------------------------------------------------------------------------- %defattr(-,root,root) @@ -569,6 +569,7 @@ %endif #------------------------------------------------------------------------------- + %files -n libmysqlclient18 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -576,6 +577,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqlclient_r18 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -583,6 +585,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files bench -f mysql-bench.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -591,8 +594,10 @@ #------------------------------------------------------------------------------- %if %{defined mdkversion} + %files debuging %else + %files debug %endif #------------------------------------------------------------------------------- @@ -602,6 +607,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files test -f mysql-test.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -615,6 +621,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files tools -f mysql-tools.files %defattr(-, root, root) %_bindir/mysqlrepair @@ -624,18 +631,22 @@ %if 0%{cluster} > 0 #------------------------------------------------------------------------------- + %files ndb-storage -f mysql-ndb-storage.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-management -f mysql-ndb-management.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-tools -f mysql-ndb-tools.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-extra -f mysql-ndb-extra.files #------------------------------------------------------------------------------- %endif ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.CBjpNe/_old 2011-10-03 20:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.CBjpNe/_new 2011-10-03 20:00:38.000000000 +0200 @@ -46,14 +46,15 @@ filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files +filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mysql_plugin >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files +rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ### files not installed by make install # Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) +DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d @@ -66,7 +67,9 @@ %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} || true +for i in "${DOCS[@]}"; do + install -m 644 "${i}" "${DOCDIR}" || true +done install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql # this is used by the init script ++++++ mysql-5.5.15-arm.patch ++++++ Index: sql-common/client_plugin.c =================================================================== --- sql-common/client_plugin.c.orig +++ sql-common/client_plugin.c @@ -228,6 +228,7 @@ int mysql_client_plugin_init() { MYSQL mysql; struct st_mysql_client_plugin **builtin; + va_list empty; if (initialized) return 0; @@ -244,7 +245,7 @@ int mysql_client_plugin_init() pthread_mutex_lock(&LOCK_load_client_plugin); for (builtin= mysql_client_builtins; *builtin; builtin++) - add_plugin(&mysql, *builtin, 0, 0, 0); + add_plugin(&mysql, *builtin, 0, 0, empty); pthread_mutex_unlock(&LOCK_load_client_plugin); @@ -288,6 +289,8 @@ struct st_mysql_client_plugin * mysql_client_register_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin) { + va_list empty; + if (is_not_initialized(mysql, plugin->name)) return NULL; @@ -302,7 +305,7 @@ mysql_client_register_plugin(MYSQL *mysq plugin= NULL; } else - plugin= add_plugin(mysql, plugin, 0, 0, 0); + plugin= add_plugin(mysql, plugin, 0, 0, empty); pthread_mutex_unlock(&LOCK_load_client_plugin); return plugin; ++++++ mysql-5.5.15.tar.bz2 -> mysql-5.5.16.tar.bz2 ++++++ openSUSE:Factory/mysql-community-server/mysql-5.5.15.tar.bz2 /mounts/work_src_done/STABLE/mysql-community-server/mysql-5.5.16.tar.bz2 differ: char 11, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
