- convert to utf8

[packages/mysql.git] / mysql-c++.patch

diff --git a/mysql-c++.patch b/mysql-c++.patch
index c2c526af82d4d691982e9761d010b3bb70e7f69d..594395cf8706a517f2ce994ccd616d6053d42bc8 100644 (file)
--- a/mysql-c++.patch
+++ b/mysql-c++.patch
@@ -1,24 +1,25 @@
---- mysql-3.23.46/isam/Makefile.am~    Sat Dec  1 21:49:57 2001
-+++ mysql-3.23.46/isam/Makefile.am     Sat Dec  1 22:00:07 2001
-@@ -18,7 +18,8 @@
- LDADD =                       $(CLIENT_EXTRA_LDFLAGS) libnisam.a \
-                       $(top_builddir)/mysys/libmysys.a \
-                       $(top_builddir)/dbug/libdbug.a \
--                      $(top_builddir)/strings/libmystrings.a
-+                      $(top_builddir)/strings/libmystrings.a \
-+                      -lstdc++
+diff -ur mysql-4.1.7.org/isam/Makefile.am mysql-4.1.7/isam/Makefile.am
+--- mysql-4.1.7.org/isam/Makefile.am   2004-10-27 01:35:55.374104568 +0200
++++ mysql-4.1.7/isam/Makefile.am       2004-10-27 01:41:21.199571568 +0200
+@@ -16,7 +16,7 @@
+ 
+ INCLUDES =            @MT_INCLUDES@ -I$(top_srcdir)/include 
+ LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
+-                      ../dbug/libdbug.a ../strings/libmystrings.a
++                      ../dbug/libdbug.a ../strings/libmystrings.a $(libdir)/libsupc++.la
  pkglib_LIBRARIES =    libnisam.a
  bin_PROGRAMS =                isamchk isamlog pack_isam
  isamchk_DEPENDENCIES= $(LIBRARIES)
---- mysql-3.23.46/myisam/Makefile.am~  Sat Dec  1 22:01:10 2001
-+++ mysql-3.23.46/myisam/Makefile.am   Sat Dec  1 22:15:04 2001
-@@ -21,7 +21,8 @@
- LDADD =                       $(CLIENT_EXTRA_LDFLAGS) libmyisam.a \
+Tylko w mysql-4.1.7/isam: Makefile.am.orig
+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
-+                      $(top_builddir)/strings/libmystrings.a \
-+                      -lstdc++
+-                      $(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
+ bin_PROGRAMS =                myisamchk myisamlog myisampack myisam_ftdump
  myisamchk_DEPENDENCIES=       $(LIBRARIES)