- 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

Changed files:
    mysql-microslow_innodb.patch -> 1.1.2.13
    mysql-userstatv2.patch -> 1.1.2.15
    mysql.spec -> 1.353.2.99

diff --git a/mysql-microslow_innodb.patch b/mysql-microslow_innodb.patch
index c4bf18e23cf382b851bdadefc831e27face98950..5304e0506060ae00a6383f7daffb9c9b032551a3 100644 (file)
--- a/mysql-microslow_innodb.patch
+++ b/mysql-microslow_innodb.patch
@@ -2178,9 +2178,8 @@ diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
  }
  
  
-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 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
    /* <> 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 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
 +  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

diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 6eb4e3d97fd531f85f8d033b4317e058eb671a3e..6393c09a92c2e2446b479ec0548d13a098697f15 100644 (file)
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -1147,39 +1147,6 @@ diff -ruN a/netware/Makefile.in b/netware/Makefile.in
  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 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
    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 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
  
  /*
    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 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
    {"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 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
 +    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

diff --git a/mysql.spec b/mysql.spec
index 4986c776186253763440f7b1bb3151abecda398d..e3131b49b7293a32335433d5153c537d2b43a43d 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -24,14 +24,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 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
@@ -675,6 +674,14 @@ touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update}
        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
@@ -880,6 +887,10 @@ EOF
 %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*
@@ -1004,7 +1015,6 @@ EOF
 
 %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.*.*