- rel 1; c++ patch looks wrong anyway - dropped; info patch dropped since upstream...

diff --git a/mysql-bug-34192.patch b/mysql-bug-34192.patch
deleted file mode 100644 (file)
index d6491d4..0000000
--- a/mysql-bug-34192.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Chad MILLERDate: February 1 2008 5:53pm
-Subject: bk commit into 5.0 tree (cmiller:1.2572) BUG#34192
-
-Below is the list of changes that have just been committed into a local
-5.0 repository of cmiller.  When cmiller does a push these changes
-will be propagated to the main repository and, within 24 hours after the
-push, to the public repository.
-For information on how to access the public repository
-see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-
-ChangeSet@stripped, 2008-02-01 11:53:48-05:00, cmiller@stripped +1 -0
-  Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \
-       databases from 4.0 server
-  
-  Contribution from Arkadiusz Miskiewicz.  No CLA required for this size.
-  
-  mysqldump treated a failure to set the results charset as a severe
-  error.  
-  
-  Now, don't try to set the charset for the SHOW CREATE TABLE statement,
-  if the dumper doesn't want SET NAMES or the remote server doesn't 
-  support changing charsets.
-  
-  (The original patch tried to set the charset to binary and back in 
-  any case, and only exited-with-failure if the dumper wanted it and
-  the remote server supported it.)
-
-  client/mysqldump.c@stripped, 2008-02-01 11:53:46-05:00, cmiller@stripped +13 -3
-    Don't set the charset for receiving results if it's not wanted or if
-    the server doesn't support it.
-
-diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c       2007-12-04 22:07:00 -05:00
-+++ b/client/mysqldump.c       2008-02-01 11:53:46 -05:00
-@@ -1705,10 +1705,20 @@ static uint get_table_structure(char *ta
- 
-       my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
- 
--      if (switch_character_set_results(mysql, "binary") ||
--          mysql_query_with_error_report(mysql, &result, buff) ||
--          switch_character_set_results(mysql, default_charset))
-+      if (opt_set_charset)  /* Was forced to false if server is too old. */
-+      {
-+        if (switch_character_set_results(mysql, "binary") != 0)
-+          DBUG_RETURN(0);
-+      }
-+
-+      if (mysql_query_with_error_report(mysql, &result, buff) != 0)
-         DBUG_RETURN(0);
-+
-+      if (opt_set_charset)  /* Was forced to false if server is too old. */
-+      {
-+        if (switch_character_set_results(mysql, default_charset) != 0)
-+          DBUG_RETURN(0);
-+      }
- 
-       if (path)
-       {

diff --git a/mysql-c++.patch b/mysql-c++.patch
deleted file mode 100644 (file)
index 2abe3d5..0000000
--- a/mysql-c++.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mysql-4.1.7.org/myisam/Makefile.am mysql-4.1.7/myisam/Makefile.am
---- mysql-4.1.7.org/myisam/Makefile.am 2004-10-27 01:35:55.000000000 +0200
-+++ mysql-4.1.7/myisam/Makefile.am     2004-10-27 01:41:47.764533080 +0200
-@@ -21,7 +21,7 @@
- LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
-                       $(top_builddir)/mysys/libmysys.a \
-                       $(top_builddir)/dbug/libdbug.a \
--                      $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-+                      $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ $(libdir)/libsupc++.la
- pkglib_LIBRARIES =    libmyisam.a
- bin_PROGRAMS =                myisamchk myisamlog myisampack myisam_ftdump
- myisamchk_DEPENDENCIES=       $(LIBRARIES)

diff --git a/mysql-info.patch b/mysql-info.patch
deleted file mode 100644 (file)
index 179f823..0000000
--- a/mysql-info.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mysql-4.1.12/Docs/mysql.info~      2005-05-16 08:05:46.000000000 +0300
-+++ mysql-4.1.12/Docs/mysql.info       2005-05-16 08:06:36.000000000 +0300
-@@ -1,8 +1,9 @@
- This is mysql.info, produced by makeinfo version 4.7 from manual.texi.
- 
--START-INFO-DIR-ENTRY
--* mysql: (mysql).               MySQL documentation.
--END-INFO-DIR-ENTRY
-+@dircategory Data bases:
-+@direntry
-+* mysql: (mysql).                     MySQL documentation
-+@end direntry
- 
- \1f
- File: mysql.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)

diff --git a/mysql.spec b/mysql.spec
index fe8db925545c867de9ff8b9e053655ef8045914b..bd81d763938e80cae315ef43a0743060139283a1 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -38,7 +38,7 @@ Summary(zh_CN.UTF-8): MySQL数据库服务器
 Name:          mysql
 %define        percona_rel     28.1
 Version:       5.5.27
-Release:       0.1
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -62,13 +62,12 @@ Source13:   %{name}-client.conf
 Source14:      my.cnf
 # from fedora
 Source15:      lib%{name}.version
-Patch2:                %{name}-c++.patch
-Patch3:                %{name}-info.patch
+
 Patch4:                bug-62472.patch
 # from fedora
 Patch5:                %{name}-versioning.patch
 Patch6:                %{name}-system-users.patch
-Patch7:                %{name}-bug-34192.patch
+
 Patch8:                %{name}-client-config.patch
 Patch9:                %{name}-build.patch
 Patch11:       %{name}-upgrade.patch
@@ -496,14 +495,11 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 mv sphinx-*/mysqlse storage/sphinx
 %patch18 -p1
 %endif
-#%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++
-# obsolete, no more docs?
-#%patch3 -p1
+
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-# make sure mysqldump still works with 4.0
-#%patch7 -p1
+
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1