]>
Commit | Line | Data |
---|---|---|
24b54207 AM |
1 | diff -ur mysql-5.1.50.org/plugin/daemon_example/Makefile.am mysql-5.1.50/plugin/daemon_example/Makefile.am |
2 | --- mysql-5.1.50.org/plugin/daemon_example/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
3 | +++ mysql-5.1.50/plugin/daemon_example/Makefile.am 2010-09-23 20:52:58.514057048 +0200 | |
075b91cf ER |
4 | @@ -26,7 +26,7 @@ |
5 | ||
6 | EXTRA_LTLIBRARIES = libdaemon_example.la | |
7 | pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@ | |
8 | -libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir) | |
9 | +libdaemon_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) | |
24b54207 | 10 | libdaemon_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
075b91cf ER |
11 | libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
12 | libdaemon_example_la_SOURCES = daemon_example.cc | |
24b54207 AM |
13 | diff -ur mysql-5.1.50.org/storage/archive/Makefile.am mysql-5.1.50/storage/archive/Makefile.am |
14 | --- mysql-5.1.50.org/storage/archive/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
15 | +++ mysql-5.1.50/storage/archive/Makefile.am 2010-09-23 20:53:04.487687594 +0200 | |
075b91cf ER |
16 | @@ -35,7 +35,7 @@ |
17 | ||
18 | EXTRA_LTLIBRARIES = ha_archive.la | |
19 | pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ | |
20 | -ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) | |
21 | +ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) | |
24b54207 | 22 | ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
075b91cf ER |
23 | ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
24 | ha_archive_la_SOURCES = ha_archive.cc azio.c | |
24b54207 AM |
25 | diff -ur mysql-5.1.50.org/storage/blackhole/Makefile.am mysql-5.1.50/storage/blackhole/Makefile.am |
26 | --- mysql-5.1.50.org/storage/blackhole/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
27 | +++ mysql-5.1.50/storage/blackhole/Makefile.am 2010-09-23 20:53:04.487687594 +0200 | |
075b91cf ER |
28 | @@ -34,7 +34,7 @@ |
29 | ||
30 | EXTRA_LTLIBRARIES = ha_blackhole.la | |
31 | pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ | |
32 | -ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) | |
33 | +ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) | |
24b54207 | 34 | ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
075b91cf ER |
35 | ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
36 | ha_blackhole_la_SOURCES=ha_blackhole.cc | |
24b54207 AM |
37 | diff -ur mysql-5.1.50.org/storage/csv/Makefile.am mysql-5.1.50/storage/csv/Makefile.am |
38 | --- mysql-5.1.50.org/storage/csv/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
39 | +++ mysql-5.1.50/storage/csv/Makefile.am 2010-09-23 20:53:04.487687596 +0200 | |
40 | @@ -31,7 +31,7 @@ | |
41 | ||
42 | EXTRA_LTLIBRARIES = ha_csv.la | |
43 | pkglib_LTLIBRARIES = @plugin_csv_shared_target@ | |
44 | -ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) | |
45 | +ha_csv_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
46 | ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN | |
47 | ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc | |
48 | ||
49 | diff -ur mysql-5.1.50.org/storage/example/Makefile.am mysql-5.1.50/storage/example/Makefile.am | |
50 | --- mysql-5.1.50.org/storage/example/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
51 | +++ mysql-5.1.50/storage/example/Makefile.am 2010-09-23 20:53:04.487687596 +0200 | |
52 | @@ -34,7 +34,7 @@ | |
53 | ||
54 | EXTRA_LTLIBRARIES = ha_example.la | |
55 | pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ | |
56 | -ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) | |
57 | +ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) | |
58 | ha_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
59 | ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
60 | ha_example_la_SOURCES = ha_example.cc | |
61 | diff -ur mysql-5.1.50.org/storage/federated/Makefile.am mysql-5.1.50/storage/federated/Makefile.am | |
62 | --- mysql-5.1.50.org/storage/federated/Makefile.am 2010-08-03 19:24:29.000000000 +0200 | |
63 | +++ mysql-5.1.50/storage/federated/Makefile.am 2010-09-23 20:53:04.487687596 +0200 | |
075b91cf ER |
64 | @@ -34,7 +34,7 @@ |
65 | ||
66 | EXTRA_LTLIBRARIES = ha_federated.la | |
67 | pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ | |
68 | -ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) | |
69 | +ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) | |
24b54207 | 70 | ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
075b91cf ER |
71 | ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
72 | ha_federated_la_SOURCES = ha_federated.cc | |
24b54207 AM |
73 | diff -ur mysql-5.1.50.org/storage/ibmdb2i/Makefile.am mysql-5.1.50/storage/ibmdb2i/Makefile.am |
74 | --- mysql-5.1.50.org/storage/ibmdb2i/Makefile.am 2010-08-03 19:24:22.000000000 +0200 | |
75 | +++ mysql-5.1.50/storage/ibmdb2i/Makefile.am 2010-09-23 20:53:04.491021090 +0200 | |
075b91cf ER |
76 | @@ -33,7 +33,7 @@ |
77 | EXTRA_LTLIBRARIES = ha_ibmdb2i.la | |
78 | pkgplugin_LTLIBRARIES = @plugin_ibmdb2i_shared_target@ | |
79 | ha_ibmdb2i_la_LIBADD = -liconv | |
80 | -ha_ibmdb2i_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) | |
81 | +ha_ibmdb2i_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
24b54207 | 82 | ha_ibmdb2i_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
075b91cf ER |
83 | ha_ibmdb2i_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
84 | ha_ibmdb2i_la_SOURCES = ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \ | |
24b54207 AM |
85 | diff -ur mysql-5.1.50.org/storage/innobase/Makefile.am mysql-5.1.50/storage/innobase/Makefile.am |
86 | --- mysql-5.1.50.org/storage/innobase/Makefile.am 2010-08-03 19:24:20.000000000 +0200 | |
87 | +++ mysql-5.1.50/storage/innobase/Makefile.am 2010-09-23 20:53:04.494354584 +0200 | |
88 | @@ -162,7 +162,7 @@ | |
89 | EXTRA_LTLIBRARIES= ha_innodb.la | |
90 | pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ | |
91 | ||
92 | -ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir) | |
93 | +ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) | |
94 | ha_innodb_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) | |
95 | ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) | |
96 | ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES) | |
97 | diff -ur mysql-5.1.50.org/storage/innodb_plugin/Makefile.am mysql-5.1.50/storage/innodb_plugin/Makefile.am | |
98 | --- mysql-5.1.50.org/storage/innodb_plugin/Makefile.am 2010-08-03 19:24:19.000000000 +0200 | |
99 | +++ mysql-5.1.50/storage/innodb_plugin/Makefile.am 2010-09-23 20:53:04.494354584 +0200 | |
100 | @@ -331,7 +331,7 @@ | |
101 | EXTRA_LTLIBRARIES= ha_innodb_plugin.la | |
102 | pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ | |
103 | ||
104 | -ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) | |
105 | +ha_innodb_plugin_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) | |
106 | ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) | |
107 | ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) | |
108 | ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) | |
109 | diff -ur mysql-5.1.50.org/storage/sphinx/Makefile.am mysql-5.1.50/storage/sphinx/Makefile.am | |
110 | --- mysql-5.1.50.org/storage/sphinx/Makefile.am 2010-09-23 20:51:48.660581537 +0200 | |
111 | +++ mysql-5.1.50/storage/sphinx/Makefile.am 2010-09-23 20:53:05.261059401 +0200 | |
112 | @@ -38,12 +38,12 @@ | |
113 | EXTRA_LTLIBRARIES = ha_sphinx.la | |
114 | pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la | |
115 | ||
116 | -ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
117 | +ha_sphinx_la_LDFLAGS = -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir) | |
118 | ha_sphinx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
119 | ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
120 | ha_sphinx_la_SOURCES = ha_sphinx.cc | |
121 | ||
122 | -sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
123 | +sphinx_la_LDFLAGS = -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir) | |
124 | sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
125 | sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
126 | sphinx_la_SOURCES = snippets_udf.cc |