upgrading package: mysql51 5.1.18 -> 5.1.22

mysql51/mysql51.patch

@@ -1,7 +1,7 @@
 Index: include/Makefile.in
---- include/Makefile.in.orig	2007-05-08 11:42:16 +0200
-+++ include/Makefile.in	2007-05-16 21:28:21 +0200
-@@ -394,14 +394,14 @@
+--- include/Makefile.in.orig	2007-09-24 12:32:02 +0200
++++ include/Makefile.in	2007-10-01 07:39:56 +0200
+@@ -395,14 +395,14 @@
  			decimal.h errmsg.h my_global.h my_net.h \
  			my_getopt.h sslopt-longopts.h my_dir.h \
  			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
@@ -16,13 +16,40 @@ Index: include/Makefile.in
 -			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
 +			my_nosys.h my_alarm.h queues.h \
 +			my_tree.h my_trie.h hash.h thr_alarm.h \
- 			thr_lock.h t_ctype.h violite.h md5.h base64.h \
+ 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
  			mysql_version.h.in my_handler.h my_time.h \
  			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
+Index: include/my_global.h
+--- include/my_global.h.orig	2007-09-24 12:30:24 +0200
++++ include/my_global.h	2007-10-01 07:39:56 +0200
+@@ -562,12 +562,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+ 
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b)	((a) > (b) ? (a) : (b))
+-#define min(a, b)	((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,4 +1502,10 @@
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
+ 
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b)	((a) > (b) ? (a) : (b))
++#define min(a, b)	((a) < (b) ? (a) : (b))
++#endif
++
+ #endif /* my_global_h */
 Index: mysys/default.c
---- mysys/default.c.orig	2007-05-08 11:41:21 +0200
-+++ mysys/default.c	2007-05-16 21:24:29 +0200
-@@ -1011,8 +1011,7 @@
+--- mysys/default.c.orig	2007-09-24 12:30:12 +0200
++++ mysys/default.c	2007-10-01 07:39:56 +0200
+@@ -1012,8 +1012,7 @@
  #elif defined(__NETWARE__)
    *ptr++= "sys:/etc/";
  #else
@@ -33,8 +60,8 @@ Index: mysys/default.c
    if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
      *ptr++= env;
 Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig	2007-05-08 11:41:08 +0200
-+++ scripts/mysql_config.sh	2007-05-16 21:24:29 +0200
+--- scripts/mysql_config.sh.orig	2007-09-24 12:29:59 +0200
++++ scripts/mysql_config.sh	2007-10-01 07:39:56 +0200
 @@ -97,9 +97,9 @@
  
  # Create options 
@@ -48,8 +75,8 @@ Index: scripts/mysql_config.sh
  
  cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig	2007-05-08 11:40:59 +0200
-+++ scripts/mysql_system_tables_data.sql	2007-05-16 21:29:50 +0200
+--- scripts/mysql_system_tables_data.sql.orig	2007-09-24 12:29:43 +0200
++++ scripts/mysql_system_tables_data.sql	2007-10-01 07:39:56 +0200
 @@ -5,8 +5,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
@@ -60,14 +87,14 @@ Index: scripts/mysql_system_tables_data.sql
  DROP TABLE tmp_db;
  
 Index: sql/Makefile.in
---- sql/Makefile.in.orig	2007-05-08 11:42:28 +0200
-+++ sql/Makefile.in	2007-05-16 21:24:29 +0200
-@@ -502,7 +502,7 @@
+--- sql/Makefile.in.orig	2007-09-24 12:32:16 +0200
++++ sql/Makefile.in	2007-10-01 07:39:56 +0200
+@@ -512,7 +512,7 @@
  			$(top_builddir)/strings/libmystrings.a
  
- mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
--LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
-+LDADD = $(SUPPORTING_LIBS)
- mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
++LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@
+ mysqld_LDADD = libndb.la \
+ 			@MYSQLD_EXTRA_LDFLAGS@ \
  			@pstack_libs@ \
- 			@mysql_plugin_libs@ \

mysql51/mysql51.spec

@@ -24,8 +24,8 @@
 
 #   package version
 %define       V_major   5.1
-%define       V_minor   18
-%define       V_mysql   %{V_major}.%{V_minor}-beta
+%define       V_minor   22
+%define       V_mysql   %{V_major}.%{V_minor}-rc
 %define       V_opkg    %{V_major}.%{V_minor}
 
 #   package information
@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20070516
+Release:      20071001
 
 #   package options
 %option       with_server      yes