packages (MYSQL_5_0): mysql/mysql-microslow_innodb.patch, mysql/mysql-users...

glen glen at pld-linux.org
Thu Feb 24 15:55:55 CET 2011 

Author: glen                         Date: Thu Feb 24 14:55:55 2011 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- up to 5.0.92
- package new sphinx plugin files
- EXCEPTIONS-CLIENT file gone, ChangeLog refers to Bug#58340, but that bug is private
  only thing I found about it was this: http://kb.askmonty.org/v/licensing-faq#mysql-5155-client-license-change

---- Files affected:
packages/mysql:
   mysql-microslow_innodb.patch (1.1.2.12 -> 1.1.2.13) , mysql-userstatv2.patch (1.1.2.14 -> 1.1.2.15) , mysql.spec (1.353.2.98 -> 1.353.2.99) 

---- Diffs:

================================================================
Index: packages/mysql/mysql-microslow_innodb.patch
diff -u packages/mysql/mysql-microslow_innodb.patch:1.1.2.12 packages/mysql/mysql-microslow_innodb.patch:1.1.2.13
--- packages/mysql/mysql-microslow_innodb.patch:1.1.2.12	Thu Feb 24 14:50:44 2011
+++ packages/mysql/mysql-microslow_innodb.patch	Thu Feb 24 15:55:49 2011
@@ -2178,9 +2178,8 @@
  }
  
  
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	Tue Jul 28 23:39:12 2009 -0700
-+++ b/sql/sql_class.h	Tue Jul 28 23:42:44 2009 -0700
+--- mysql-5.0.92/sql/sql_class.h	Tue Jul 28 23:39:12 2009 -0700
++++ mysql-5.0.92/sql/sql_class.h	Tue Jul 28 23:42:44 2009 -0700
 @@ -43,6 +43,7 @@
  extern char internal_table_name[2];
  extern char empty_c_string[1];
@@ -2278,7 +2277,7 @@
    /* <> 0 if we are inside of trigger or stored function. */
    uint in_sub_stmt;
  
-@@ -1702,11 +1732,11 @@
+@@ -1732,11 +1732,11 @@
        sql_print_information("time() failed with %d", errno);
    }
  
@@ -2292,9 +2291,9 @@
 +  inline void	end_time()    { end_timer(); safe_time(&start_time); }
 +  inline void	set_time(time_t t) { set_timer(); time_after_lock=start_time=user_time=t; }
 +  inline void	lock_time()   { lock_timer(); safe_time(&time_after_lock); }
-   inline void	insert_id(ulonglong id_arg)
-   {
-     last_insert_id= id_arg;
+   /*TODO: this will be obsolete when we have support for 64 bit my_time_t */
+   inline bool	is_valid_time() 
+   { 
 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc	Tue Jul 28 23:39:12 2009 -0700
 +++ b/sql/sql_parse.cc	Tue Jul 28 23:42:44 2009 -0700

================================================================
Index: packages/mysql/mysql-userstatv2.patch
diff -u packages/mysql/mysql-userstatv2.patch:1.1.2.14 packages/mysql/mysql-userstatv2.patch:1.1.2.15
--- packages/mysql/mysql-userstatv2.patch:1.1.2.14	Thu Feb 24 14:50:44 2011
+++ packages/mysql/mysql-userstatv2.patch	Thu Feb 24 15:55:49 2011
@@ -1147,39 +1147,6 @@
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/Makefile.in b/os2/Makefile.in
---- a/os2/Makefile.in	Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/Makefile.in	Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/Makefile.in b/os2/include/Makefile.in
---- a/os2/include/Makefile.in	Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/Makefile.in	Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/sys/Makefile.in b/os2/include/sys/Makefile.in
---- a/os2/include/sys/Makefile.in	Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/sys/Makefile.in	Wed Jul 29 13:34:11 2009 -0700
-@@ -144,6 +144,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
 diff -ruN /dev/null b/patch_info/userstats.info
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/patch_info/userstats.info	Wed Jul 29 13:34:11 2009 -0700
@@ -3487,9 +3454,8 @@
    DBUG_VOID_RETURN;
  }
  
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc	Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_show.cc	Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.92/sql/sql_show.cc~	2011-02-24 15:55:10.000000000 +0200
++++ mysql-5.0.92/sql/sql_show.cc	2011-02-24 15:56:28.993570019 +0200
 @@ -540,6 +540,7 @@
  		sctx->master_access);
    if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
@@ -3877,13 +3843,13 @@
  
  /*
    Description of ST_FIELD_INFO in table.h
-@@ -4504,6 +4870,8 @@
+@@ -4906,6 +4906,8 @@
  {
-   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
+   {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
     fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
 +  {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table, 
 +    fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
-   {"COLLATIONS", collation_fields_info, create_schema_table, 
+   {"COLLATIONS", collation_fields_info, create_schema_table,
     fill_schema_collation, make_old_format, 0, -1, -1, 0},
    {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
 @@ -4512,6 +4880,8 @@
@@ -3895,7 +3861,7 @@
    {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
      get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
    {"OPEN_TABLES", open_tables_fields_info, create_schema_table,
-@@ -4537,10 +4907,14 @@
+@@ -4941,10 +4943,14 @@
     get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
    {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
      fill_schema_table_privileges, 0, 0, -1, -1, 0},
@@ -3903,13 +3869,13 @@
 +    fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
    {"TRIGGERS", triggers_fields_info, create_schema_table,
     get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
-   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 
+   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
      fill_schema_user_privileges, 0, 0, -1, -1, 0},
 +  {"USER_STATISTICS", user_stats_fields_info, create_schema_table, 
 +    fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
    {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
     make_old_format, 0, -1, -1, 1},
-   {"VIEWS", view_fields_info, create_schema_table, 
+   {"VIEWS", view_fields_info, create_schema_table,
 diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
 --- a/sql/sql_update.cc	Wed Jul 29 13:33:34 2009 -0700
 +++ b/sql/sql_update.cc	Wed Jul 29 13:34:11 2009 -0700

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.353.2.98 packages/mysql/mysql.spec:1.353.2.99
--- packages/mysql/mysql.spec:1.353.2.98	Sat Dec 18 19:48:41 2010
+++ packages/mysql/mysql.spec	Thu Feb 24 15:55:49 2011
@@ -25,14 +25,13 @@
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.0.91
-Release:	3
+Version:	5.0.92
+Release:	1
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
-#Source0:	http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
-Source0:	http://downloads.mysql.com/archives/mysql-5.0/%{name}-%{version}.tar.gz
-# Source0-md5:	e28f93b1a1b10b028135c1d51bbd4c46
-#Source0:	http://mysql.he.net/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
+Source0:	ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
+# Source0-md5:	a72ee3d1d54bff74836de9500858a311
+#Source0:	http://downloads.mysql.com/archives/mysql-5.0/%{name}-%{version}.tar.gz
 #Source0:	http://mirror.provenscaling.com/mysql/enterprise/source/5.0/%{name}-%{version}.tar.gz
 Source100:	http://www.sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz
 # Source100-md5:	7b9b618cb9b378f949bb1b91ddcc4f54
@@ -676,6 +675,14 @@
 	awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
 %endif
 
+%if %{with sphinx}
+rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.a
+rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.la
+# TODO: patch build with -avoid-version
+rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.so.0
+mv -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.so{.0.0.0,}
+%endif
+
 install mysqld.conf $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf
 cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/mysql-client.conf
 cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/skel/.my.cnf
@@ -881,6 +888,10 @@
 %attr(755,root,root) %{_sbindir}/mysql_upgrade
 %attr(755,root,root) %{_sbindir}/mysqlcheck
 %attr(755,root,root) %{_sbindir}/mysqld
+%if %{with sphinx}
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/sphinx.so
+%endif
 %{_mandir}/man1/innochecksum.1*
 %{_mandir}/man1/my_print_defaults.1*
 %{_mandir}/man1/myisamchk.1*
@@ -1005,7 +1016,6 @@
 
 %files libs
 %defattr(644,root,root,755)
-%doc EXCEPTIONS-CLIENT
 %attr(751,root,root) %dir %{_sysconfdir}/mysql
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf
 %attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*
@@ -1120,6 +1130,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.99  2011/02/24 14:55:49  glen
+- up to 5.0.92
+- package new sphinx plugin files
+- EXCEPTIONS-CLIENT file gone, ChangeLog refers to Bug#58340, but that bug is private
+  only thing I found about it was this: http://kb.askmonty.org/v/licensing-faq#mysql-5155-client-license-change
+
 Revision 1.353.2.98  2010/12/18 18:48:41  glen
 - updated percona patches (release-5.0.91-22); rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-microslow_innodb.patch?r1=1.1.2.12&r2=1.1.2.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstatv2.patch?r1=1.1.2.14&r2=1.1.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.98&r2=1.353.2.99&f=u

More information about the pld-cvs-commit mailing list