update and sync with mysql

mysql55/mysql55.patch

@@ -1,7 +1,7 @@
 Index: include/Makefile.in
---- include/Makefile.in.orig	2009-08-26 12:20:03 +0200
-+++ include/Makefile.in	2009-09-19 09:25:52 +0200
-@@ -403,15 +403,15 @@
+--- include/Makefile.in.orig	2010-03-24 21:30:12.000000000 +0100
++++ include/Makefile.in	2010-07-27 11:04:45.000000000 +0200
+@@ -416,15 +416,15 @@
  			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 \
@@ -9,7 +9,7 @@ Index: include/Makefile.in
 +			m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN_CONFIGURE) \
  			$(HEADERS_GEN_MAKE) probes_mysql.h probes_mysql_nodtrace.h
  
- noinst_HEADERS = config-win.h config-netware.h my_bit.h \
+ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
  			heap.h my_bitmap.h my_uctype.h \
  			myisam.h myisampack.h myisammrg.h ft_global.h\
  			mysys_err.h my_base.h help_start.h help_end.h \
@@ -18,12 +18,12 @@ Index: include/Makefile.in
 +			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 my_md5.h base64.h \
- 			my_handler.h my_time.h \
- 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
+ 			my_handler.h my_time.h service_versions.h \
+ 			my_rdtsc.h mysql/psi/psi_abi_v1.h mysql/psi/psi_abi_v2.h \
 Index: mysys/default.c
---- mysys/default.c.orig	2009-08-26 12:11:09 +0200
-+++ mysys/default.c	2009-09-19 09:25:52 +0200
-@@ -1123,8 +1123,7 @@
+--- mysys/default.c.orig	2010-03-24 21:22:01.000000000 +0100
++++ mysys/default.c	2010-07-27 10:53:40.000000000 +0200
+@@ -1156,8 +1156,7 @@
  
  #else
  
@@ -34,8 +34,8 @@ Index: mysys/default.c
  #if defined(DEFAULT_SYSCONFDIR)
    if (DEFAULT_SYSCONFDIR[0])
 Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig	2009-09-01 21:13:49 +0200
-+++ scripts/mysql_config.sh	2009-09-19 09:29:12 +0200
+--- scripts/mysql_config.sh.orig	2010-03-24 21:22:04.000000000 +0100
++++ scripts/mysql_config.sh	2010-07-27 10:53:40.000000000 +0200
 @@ -104,9 +104,9 @@
  
  # Create options 
@@ -49,8 +49,8 @@ Index: scripts/mysql_config.sh
  
  if [ -r "$pkglibdir/libmygcc.a" ]; then
 Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig	2009-08-26 12:11:13 +0200
-+++ scripts/mysql_system_tables_data.sql	2009-09-19 09:25:52 +0200
+--- scripts/mysql_system_tables_data.sql.orig	2010-03-24 21:22:05.000000000 +0100
++++ scripts/mysql_system_tables_data.sql	2010-07-27 10:53:40.000000000 +0200
 @@ -11,8 +11,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
@@ -61,9 +61,9 @@ Index: scripts/mysql_system_tables_data.sql
  DROP TABLE tmp_db;
  
 Index: sql/Makefile.in
---- sql/Makefile.in.orig	2009-08-26 12:20:15 +0200
-+++ sql/Makefile.in	2009-09-19 09:25:52 +0200
-@@ -571,7 +571,7 @@
+--- sql/Makefile.in.orig	2010-03-24 21:30:19.000000000 +0100
++++ sql/Makefile.in	2010-07-27 10:53:40.000000000 +0200
+@@ -583,7 +583,7 @@
  
  mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la \
  	$(am__append_2)

mysql55/mysql55.spec

@@ -23,10 +23,10 @@
 
 #   package version
 %define       V_major   5.5
-%define       V_minor   2
-%define       V_mysql   %{V_major}.%{V_minor}-m2
+%define       V_minor   3
+%define       V_mysql   %{V_major}.%{V_minor}-m3
 %define       V_opkg    %{V_major}.%{V_minor}
-%define       V_jdbc    5.1.10
+%define       V_jdbc    5.1.13
 
 #   package information
 Name:         mysql55
@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20100228
+Release:      20100727
 
 #   package options
 %option       with_server      yes
@@ -253,6 +253,15 @@ Provides:     mysql = %{version}-%{release}
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/comp_err
     strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
     strip  $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
+%if "%{with_ndbcluster}" == "yes"
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/ndb*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/man/man1/ndb*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/man/man8/ndb*
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/mysql/storage/ndb
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/mysql/libndb*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/ndb*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/mysql/ndb-config-2-node.ini
+%endif
 
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql