| 1 |
commit: 6ab170bf92605919703b112734cc1bbc1215ef33 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net> |
| 3 |
AuthorDate: Fri Nov 18 20:58:03 2011 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 18 20:58:09 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=6ab170bf |
| 7 |
|
| 8 |
Respin 02040_all_embedded-library-shared-5.1.50.patch for 5.1.60 by editing it directly. |
| 9 |
|
| 10 |
--- |
| 11 |
00000_index.txt | 7 +- |
| 12 |
02040_all_embedded-library-shared-5.1.60.patch | 2298 ++++++++++++++++++++++++ |
| 13 |
2 files changed, 2304 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/00000_index.txt b/00000_index.txt |
| 16 |
index a0b07a8..2577963 100644 |
| 17 |
--- a/00000_index.txt |
| 18 |
+++ b/00000_index.txt |
| 19 |
@@ -291,7 +291,12 @@ |
| 20 |
@@ Take libmysqld to be a proper shared library. |
| 21 |
|
| 22 |
@patch 02040_all_embedded-library-shared-5.1.50.patch |
| 23 |
-@ver 5.01.50.00 to 5.01.99.99 |
| 24 |
+@ver 5.01.50.00 to 5.01.59.99 |
| 25 |
+@pn mysql |
| 26 |
+@@ Take libmysqld to be a proper shared library. |
| 27 |
+ |
| 28 |
+@patch 02040_all_embedded-library-shared-5.1.60.patch |
| 29 |
+@ver 5.01.60.00 to 5.01.99.99 |
| 30 |
@pn mysql |
| 31 |
@@ Take libmysqld to be a proper shared library. |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/02040_all_embedded-library-shared-5.1.60.patch b/02040_all_embedded-library-shared-5.1.60.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..4bff5b6 |
| 37 |
--- /dev/null |
| 38 |
+++ b/02040_all_embedded-library-shared-5.1.60.patch |
| 39 |
@@ -0,0 +1,2298 @@ |
| 40 |
+Convert all of the static libraries for the embedded libmysqld to build as |
| 41 |
+shared. |
| 42 |
+ |
| 43 |
+This enables amarok's mysql extension to properly build as a shared object, |
| 44 |
+without statically including libmysqld or nor forcing libmysqld to be built |
| 45 |
+with -fPIC. |
| 46 |
+ |
| 47 |
+Thanks to <pageexec@××××××××.hu> for the @plt fixes. |
| 48 |
+Thanks to Diego Elio Pettenò <flameeyes@g.o> for all the extensive build |
| 49 |
+system help with libtool conversions. |
| 50 |
+Thanks to Maciej Mrozowski <reavertm@g.o> for working in the redo of the |
| 51 |
+patch for mysql-5.1. |
| 52 |
+ |
| 53 |
+Gentoo-Bug: 238487 |
| 54 |
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=238487 |
| 55 |
+MySQL-Bug-URL: http://bugs.mysql.com/bug.php?id=39288 |
| 56 |
+MySQL-Bug: 39288 |
| 57 |
+MySQL-Lists-URL: http://lists.mysql.com/internals/35947 |
| 58 |
+X-Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=188019&action=view |
| 59 |
+Signed-off-by: Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 60 |
+Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 61 |
+Signed-off-by: Kristian Nielsen <knielsen@×××××××××××.org> |
| 62 |
+ |
| 63 |
+=== modified file 'client/Makefile.am' |
| 64 |
+--- |
| 65 |
+ client/Makefile.am | 11 - |
| 66 |
+ config/ac-macros/plugins.m4 | 107 ++++++++----- |
| 67 |
+ configure.in | 8 - |
| 68 |
+ dbug/Makefile.am | 6 |
| 69 |
+ extra/Makefile.am | 4 |
| 70 |
+ libmysqld/Makefile.am | 184 ++++++++--------------- |
| 71 |
+ libmysqld/examples/Makefile.am | 10 - |
| 72 |
+ mysys/Makefile.am | 42 ++--- |
| 73 |
+ netware/BUILD/compile-linux-tools | 16 +- |
| 74 |
+ netware/Makefile.am | 4 |
| 75 |
+ regex/Makefile.am | 6 |
| 76 |
+ server-tools/instance-manager/Makefile.am | 8 - |
| 77 |
+ sql/Makefile.am | 12 - |
| 78 |
+ storage/archive/Makefile.am | 23 +- |
| 79 |
+ storage/archive/plug.in | 2 |
| 80 |
+ storage/blackhole/Makefile.am | 11 - |
| 81 |
+ storage/blackhole/plug.in | 2 |
| 82 |
+ storage/csv/Makefile.am | 9 - |
| 83 |
+ storage/csv/plug.in | 2 |
| 84 |
+ storage/example/Makefile.am | 11 - |
| 85 |
+ storage/federated/Makefile.am | 15 + |
| 86 |
+ storage/federated/plug.in | 3 |
| 87 |
+ storage/heap/Makefile.am | 37 +++- |
| 88 |
+ storage/heap/plug.in | 3 |
| 89 |
+ storage/innobase/Makefile.am | 40 ++--- |
| 90 |
+ storage/innobase/plug.in | 2 |
| 91 |
+ storage/innodb_plugin/Makefile.am | 13 - |
| 92 |
+ storage/myisam/Makefile.am | 118 ++++++++------ |
| 93 |
+ storage/myisam/plug.in | 4 |
| 94 |
+ storage/myisammrg/Makefile.am | 20 ++ |
| 95 |
+ storage/myisammrg/plug.in | 3 |
| 96 |
+ storage/ndb/config/type_ndbapitest.mk.am | 31 ++- |
| 97 |
+ storage/ndb/config/type_ndbapitools.mk.am | 33 ++-- |
| 98 |
+ storage/ndb/config/win-libraries | 2 |
| 99 |
+ storage/ndb/src/common/util/Makefile.am | 6 |
| 100 |
+ storage/ndb/src/cw/cpcd/Makefile.am | 6 |
| 101 |
+ storage/ndb/src/kernel/Makefile.am | 7 |
| 102 |
+ storage/ndb/src/kernel/blocks/Makefile.am | 10 - |
| 103 |
+ storage/ndb/src/kernel/blocks/backup/Makefile.am | 6 |
| 104 |
+ storage/ndb/src/kernel/blocks/dbdict/Makefile.am | 12 - |
| 105 |
+ storage/ndb/src/kernel/blocks/dbdih/Makefile.am | 6 |
| 106 |
+ storage/ndb/src/kernel/blocks/dblqh/Makefile.am | 6 |
| 107 |
+ storage/ndb/src/kernel/blocks/dbtup/Makefile.am | 6 |
| 108 |
+ storage/ndb/src/kernel/vm/Makefile.am | 82 +++++----- |
| 109 |
+ storage/ndb/src/mgmclient/Makefile.am | 65 ++++---- |
| 110 |
+ storage/ndb/src/mgmsrv/Makefile.am | 70 ++++---- |
| 111 |
+ storage/ndb/src/ndbapi/Makefile.am | 98 ++++++------ |
| 112 |
+ storage/ndb/test/run-test/Makefile.am | 6 |
| 113 |
+ strings/Makefile.am | 16 +- |
| 114 |
+ unittest/mysys/Makefile.am | 15 + |
| 115 |
+ unittest/strings/Makefile.am | 9 - |
| 116 |
+ unittest/unit.pl | 2 |
| 117 |
+ vio/Makefile.am | 4 |
| 118 |
+ 53 files changed, 622 insertions(+), 612 deletions(-) |
| 119 |
+ |
| 120 |
+Index: client/Makefile.am |
| 121 |
+=================================================================== |
| 122 |
+--- client/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 123 |
++++ client/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 124 |
+@@ -75,7 +75,8 @@ mysqlimport_CFLAGS= -DTHREAD -UUNDEF_TH |
| 125 |
+ mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ |
| 126 |
+ @CLIENT_EXTRA_LDFLAGS@ \ |
| 127 |
+ $(LIBMYSQLCLIENT_LA) \ |
| 128 |
+- $(top_builddir)/mysys/libmysys.a |
| 129 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 130 |
++ $(top_builddir)/strings/libmystrings.la |
| 131 |
+ |
| 132 |
+ mysqlshow_SOURCES= mysqlshow.c |
| 133 |
+ |
| 134 |
+@@ -84,15 +85,17 @@ mysqlslap_CFLAGS= -DTHREAD -UMYSQL_CLIE |
| 135 |
+ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ |
| 136 |
+ @CLIENT_EXTRA_LDFLAGS@ \ |
| 137 |
+ $(LIBMYSQLCLIENT_LA) \ |
| 138 |
+- $(top_builddir)/mysys/libmysys.a |
| 139 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 140 |
++ $(top_builddir)/strings/libmystrings.la |
| 141 |
+ |
| 142 |
+ mysqltest_SOURCES= mysqltest.cc |
| 143 |
+ mysqltest_CXXFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS |
| 144 |
+ mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ |
| 145 |
+ @CLIENT_EXTRA_LDFLAGS@ \ |
| 146 |
+ $(LIBMYSQLCLIENT_LA) \ |
| 147 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 148 |
+- $(top_builddir)/regex/libregex.a \ |
| 149 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 150 |
++ $(top_builddir)/regex/libregex.la \ |
| 151 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 152 |
+ $(CLIENT_THREAD_LIBS) |
| 153 |
+ |
| 154 |
+ mysql_upgrade_SOURCES= mysql_upgrade.c \ |
| 155 |
+Index: config/ac-macros/plugins.m4 |
| 156 |
+=================================================================== |
| 157 |
+--- config/ac-macros/plugins.m4.orig 2010-11-27 15:02:45.000000000 +0100 |
| 158 |
++++ config/ac-macros/plugins.m4 2010-11-27 15:02:49.000000000 +0100 |
| 159 |
+@@ -115,18 +115,32 @@ dnl ------------------------------------ |
| 160 |
+ dnl Macro: MYSQL_PLUGIN_STATIC |
| 161 |
+ dnl |
| 162 |
+ dnl SYNOPSIS |
| 163 |
+-dnl MYSQL_PLUGIN_STATIC([name],[libmyplugin.a]) |
| 164 |
++dnl MYSQL_PLUGIN_STATIC([name],[libmyplugin.a],[libmyplugin_embedded.a]) |
| 165 |
+ dnl |
| 166 |
+ dnl DESCRIPTION |
| 167 |
+-dnl Declare the name for the static library |
| 168 |
++dnl Declare the name for the static library |
| 169 |
++dnl |
| 170 |
++dnl Third argument is optional, only needed for special plugins that depend |
| 171 |
++dnl on server internals and have source files that must be compiled specially |
| 172 |
++dnl with -DEMBEDDED_LIBRARY for embedded server. If specified, the third |
| 173 |
++dnl argument is used to link embedded server instead of the second. |
| 174 |
+ dnl |
| 175 |
+ dnl --------------------------------------------------------------------------- |
| 176 |
+ |
| 177 |
+ AC_DEFUN([MYSQL_PLUGIN_STATIC],[ |
| 178 |
+ MYSQL_REQUIRE_PLUGIN([$1]) |
| 179 |
+ m4_define([MYSQL_PLUGIN_STATIC_]AS_TR_CPP([$1]), [$2]) |
| 180 |
++ ifelse($#, 3, [ |
| 181 |
++ m4_define([MYSQL_PLUGIN_EMBEDDED_]AS_TR_CPP([$1]), [$3]) |
| 182 |
++ ]) |
| 183 |
+ ]) |
| 184 |
+ |
| 185 |
++dnl --------------------------------------------------------------------------- |
| 186 |
++dnl Substitution variable to use to compile source files specially for |
| 187 |
++dnl embedded server. |
| 188 |
++dnl To be used by plugins that have sources that depend on server internals. |
| 189 |
++dnl --------------------------------------------------------------------------- |
| 190 |
++AC_SUBST([plugin_embedded_defs], ["-DEMBEDDED_LIBRARY -DMYSQL_SERVER"]) |
| 191 |
+ |
| 192 |
+ dnl --------------------------------------------------------------------------- |
| 193 |
+ dnl Macro: MYSQL_PLUGIN_DYNAMIC |
| 194 |
+@@ -254,29 +268,6 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[ |
| 195 |
+ ]) |
| 196 |
+ |
| 197 |
+ dnl --------------------------------------------------------------------------- |
| 198 |
+-dnl Macro: MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS |
| 199 |
+-dnl |
| 200 |
+-dnl SYNOPSIS |
| 201 |
+-dnl MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS([name],[file name]) |
| 202 |
+-dnl |
| 203 |
+-dnl DESCRIPTION |
| 204 |
+-dnl Some modules in plugins keep dependance on structures |
| 205 |
+-dnl declared in sql/ (THD class usually) |
| 206 |
+-dnl That has to be fixed in the future, but until then |
| 207 |
+-dnl we have to recompile these modules when we want to |
| 208 |
+-dnl to compile server parts with the different #defines |
| 209 |
+-dnl Normally it happens when we compile the embedded server |
| 210 |
+-dnl Thus one should mark such files in his handler using this macro |
| 211 |
+-dnl (currently only one such a file per plugin is supported) |
| 212 |
+-dnl |
| 213 |
+-dnl --------------------------------------------------------------------------- |
| 214 |
+- |
| 215 |
+-AC_DEFUN([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS],[ |
| 216 |
+- MYSQL_REQUIRE_PLUGIN([$1]) |
| 217 |
+- m4_define([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]), [$2]) |
| 218 |
+-]) |
| 219 |
+- |
| 220 |
+-dnl --------------------------------------------------------------------------- |
| 221 |
+ dnl Macro: MYSQL_CONFIGURE_PLUGINS |
| 222 |
+ dnl |
| 223 |
+ dnl SYNOPSIS |
| 224 |
+@@ -336,11 +327,25 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[ |
| 225 |
+ [MYSQL_PLUGIN_DYNAMIC_]AS_TR_CPP([$1]), |
| 226 |
+ [MYSQL_PLUGIN_MANDATORY_]AS_TR_CPP([$1]), |
| 227 |
+ [MYSQL_PLUGIN_DISABLED_]AS_TR_CPP([$1]), |
| 228 |
+- [MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]), |
| 229 |
++ [MYSQL_PLUGIN_EMBEDDED_]AS_TR_CPP([$1]), |
| 230 |
+ [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1]) |
| 231 |
+ ) |
| 232 |
+ ]) |
| 233 |
+ |
| 234 |
++# __MYSQL_EMIT_CHECK_PLUGIN arguments: |
| 235 |
++# |
| 236 |
++# 1 - plugin identifying name |
| 237 |
++# 2 - plugin identifying name, with `-' replaced by `_' |
| 238 |
++# 3 - plugin long name |
| 239 |
++# 4 - plugin description |
| 240 |
++# 5 - mysql_plugin_define (eg. WITH_xxx_STORAGE_ENGINE) |
| 241 |
++# 6 - directory |
| 242 |
++# 7 - static target (if supports static build) |
| 243 |
++# 8 - dynamic target (if supports dynamic build) |
| 244 |
++# 9 - mandatory flag |
| 245 |
++# 10 - disabled flag |
| 246 |
++# 11 - static target for libmysqld (if different from mysqld) |
| 247 |
++# 12 - actions |
| 248 |
+ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ |
| 249 |
+ m4_ifdef([$5],[ |
| 250 |
+ AH_TEMPLATE($5, [Include ]$4[ into mysqld]) |
| 251 |
+@@ -407,6 +412,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ |
| 252 |
+ ]) |
| 253 |
+ AC_SUBST([plugin_]$2[_shared_target], "$8") |
| 254 |
+ AC_SUBST([plugin_]$2[_static_target], [""]) |
| 255 |
++ AC_SUBST([plugin_]$2[_embedded_static_target], [""]) |
| 256 |
+ [with_plugin_]$2=yes |
| 257 |
+ AC_MSG_RESULT([plugin]) |
| 258 |
+ m4_ifdef([$6],[ |
| 259 |
+@@ -421,32 +427,47 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ |
| 260 |
+ ]) |
| 261 |
+ else |
| 262 |
+ m4_ifdef([$7],[ |
| 263 |
+- ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ |
| 264 |
+-dnl change above "-2" to "0" to enable this section |
| 265 |
+-dnl Although this is "pretty", it breaks libmysqld build |
| 266 |
+- m4_ifdef([$6],[ |
| 267 |
+- mysql_use_plugin_dir="$6" |
| 268 |
+- mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" |
| 269 |
+- ]) |
| 270 |
+- mysql_plugin_libs="$mysql_plugin_libs dnl |
| 271 |
+-[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" |
| 272 |
+- ], m4_bregexp($7, [^\\\$]), 0, [ |
| 273 |
++ ifelse(m4_bregexp($7, [^\\\$]), 0, [ |
| 274 |
+ m4_ifdef([$6],[ |
| 275 |
+ mysql_use_plugin_dir="$6" |
| 276 |
+ ]) |
| 277 |
+ mysql_plugin_libs="$mysql_plugin_libs $7" |
| 278 |
++ m4_ifdef([$11],[ |
| 279 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $11" |
| 280 |
++ ],[ |
| 281 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $7" |
| 282 |
++ ]) |
| 283 |
+ ], [ |
| 284 |
+ m4_ifdef([$6],[ |
| 285 |
+ mysql_use_plugin_dir="$6" |
| 286 |
+ mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7" |
| 287 |
++ m4_ifdef([$11],[ |
| 288 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs \$(top_builddir)/$6/$11" |
| 289 |
++ ],[ |
| 290 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs \$(top_builddir)/$6/$7" |
| 291 |
++ ]) |
| 292 |
+ ],[ |
| 293 |
+ mysql_plugin_libs="$mysql_plugin_libs $7" |
| 294 |
++ m4_ifdef([$11],[ |
| 295 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $11" |
| 296 |
++ ],[ |
| 297 |
++ mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $7" |
| 298 |
++ ]) |
| 299 |
+ ]) |
| 300 |
+ ]) |
| 301 |
+ m4_ifdef([$5],[ |
| 302 |
+ AC_DEFINE($5) |
| 303 |
+ ]) |
| 304 |
+ AC_SUBST([plugin_]$2[_static_target], "$7") |
| 305 |
++ m4_ifdef([$11], [ |
| 306 |
++ if test "$with_embedded_server" = "yes"; then |
| 307 |
++ AC_SUBST([plugin_]$2[_embedded_static_target], "$11") |
| 308 |
++ else |
| 309 |
++ AC_SUBST([plugin_]$2[_embedded_static_target], [""]) |
| 310 |
++ fi |
| 311 |
++ ], [ |
| 312 |
++ AC_SUBST([plugin_]$2[_embedded_static_target], [""]) |
| 313 |
++ ]) |
| 314 |
+ AC_SUBST([plugin_]$2[_shared_target], [""]) |
| 315 |
+ ],[ |
| 316 |
+ m4_ifdef([$6],[ |
| 317 |
+@@ -463,12 +484,6 @@ dnl Although this is "pretty", it breaks |
| 318 |
+ mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]" |
| 319 |
+ [with_plugin_]$2=yes |
| 320 |
+ AC_MSG_RESULT([yes]) |
| 321 |
+- m4_ifdef([$11],[ |
| 322 |
+- condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])" |
| 323 |
+- condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp($11, [[^/]+\.], [\&o])" |
| 324 |
+- condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11" |
| 325 |
+- condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])" |
| 326 |
+- ]) |
| 327 |
+ fi |
| 328 |
+ fi |
| 329 |
+ |
| 330 |
+@@ -516,6 +531,14 @@ dnl |
| 331 |
+ ]) |
| 332 |
+ ]) |
| 333 |
+ |
| 334 |
++dnl If not building libmysqld embedded server, then there is no need to build |
| 335 |
++dnl shared object versions of static plugins. |
| 336 |
++if test "$with_embedded_server" = "yes"; then |
| 337 |
++ AC_SUBST([plugin_static_if_no_embedded], "") |
| 338 |
++else |
| 339 |
++ AC_SUBST([plugin_static_if_no_embedded], "-static") |
| 340 |
++fi |
| 341 |
++ |
| 342 |
+ AC_DEFUN([_MYSQL_EMIT_PLUGIN_ACTIONS],[ |
| 343 |
+ ifelse($#, 0, [], $#, 1, [ |
| 344 |
+ _MYSQL_EMIT_PLUGIN_ACTION([$1]) |
| 345 |
+Index: configure.in |
| 346 |
+=================================================================== |
| 347 |
+--- configure.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 348 |
++++ configure.in 2010-11-27 19:41:49.000000000 +0100 |
| 349 |
+@@ -2483,8 +2483,6 @@ MYSQL_STORAGE_ENGINE(partition, partitio |
| 350 |
+ |
| 351 |
+ dnl -- ndbcluster requires partition to be enabled |
| 352 |
+ |
| 353 |
+-MYSQL_CONFIGURE_PLUGINS([none]) |
| 354 |
+- |
| 355 |
+ # Only build client code? |
| 356 |
+ AC_ARG_WITH(server, |
| 357 |
+ [ --without-server Only build the client.], |
| 358 |
+@@ -2498,6 +2496,8 @@ AC_ARG_WITH(embedded-server, |
| 359 |
+ [with_embedded_server=no] |
| 360 |
+ ) |
| 361 |
+ |
| 362 |
++MYSQL_CONFIGURE_PLUGINS([none]) |
| 363 |
++ |
| 364 |
+ AC_ARG_WITH(query_cache, |
| 365 |
+ [ --without-query-cache Do not build query cache.], |
| 366 |
+ [with_query_cache=$withval], |
| 367 |
+@@ -2801,9 +2801,6 @@ if test "$with_server" != "no" -o "$THRE |
| 368 |
+ then |
| 369 |
+ AC_DEFINE([THREAD], [1], |
| 370 |
+ [Define if you want to have threaded code. This may be undef on client code]) |
| 371 |
+- # Avoid _PROGRAMS names |
| 372 |
+- THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o" |
| 373 |
+- AC_SUBST(THREAD_LOBJECTS) |
| 374 |
+ fi |
| 375 |
+ AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no") |
| 376 |
+ |
| 377 |
+@@ -2831,6 +2828,7 @@ AC_SUBST(server_scripts) |
| 378 |
+ |
| 379 |
+ AC_SUBST(mysql_plugin_dirs) |
| 380 |
+ AC_SUBST(mysql_plugin_libs) |
| 381 |
++AC_SUBST(mysql_embedded_plugin_libs) |
| 382 |
+ AC_SUBST(mysql_plugin_defs) |
| 383 |
+ |
| 384 |
+ |
| 385 |
+Index: dbug/Makefile.am |
| 386 |
+=================================================================== |
| 387 |
+--- dbug/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 388 |
++++ dbug/Makefile.am 2010-11-27 19:42:26.000000000 +0100 |
| 389 |
+@@ -16,10 +16,10 @@ |
| 390 |
+ # MA 02111-1307, USA |
| 391 |
+ |
| 392 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include |
| 393 |
+-LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a |
| 394 |
+-pkglib_LIBRARIES = libdbug.a |
| 395 |
++LDADD = libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la $(ZLIB_LIBS) |
| 396 |
++noinst_LTLIBRARIES = libdbug.la |
| 397 |
+ noinst_HEADERS = dbug_long.h |
| 398 |
+-libdbug_a_SOURCES = dbug.c sanity.c |
| 399 |
++libdbug_la_SOURCES = dbug.c sanity.c |
| 400 |
+ EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ |
| 401 |
+ user.r monty.doc dbug_add_tags.pl \ |
| 402 |
+ my_main.c main.c factorial.c dbug_analyze.c \ |
| 403 |
+Index: extra/Makefile.am |
| 404 |
+=================================================================== |
| 405 |
+--- extra/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 406 |
++++ extra/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 407 |
+@@ -15,8 +15,8 @@ |
| 408 |
+ |
| 409 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ |
| 410 |
+ -I$(top_srcdir)/sql |
| 411 |
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ |
| 412 |
+- ../dbug/libdbug.a ../strings/libmystrings.a \ |
| 413 |
++LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \ |
| 414 |
++ ../dbug/libdbug.la ../strings/libmystrings.la \ |
| 415 |
+ $(ZLIB_LIBS) |
| 416 |
+ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ |
| 417 |
+ $(top_builddir)/include/sql_state.h \ |
| 418 |
+Index: libmysqld/Makefile.am |
| 419 |
+=================================================================== |
| 420 |
+--- libmysqld/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 421 |
++++ libmysqld/Makefile.am 2010-11-27 20:58:00.000000000 +0100 |
| 422 |
+@@ -17,95 +17,91 @@ |
| 423 |
+ # |
| 424 |
+ # This file is public domain and comes with NO WARRANTY of any kind |
| 425 |
+ |
| 426 |
+-MYSQLDATAdir = $(localstatedir) |
| 427 |
+-MYSQLSHAREdir = $(pkgdatadir) |
| 428 |
+-MYSQLBASEdir= $(prefix) |
| 429 |
+-MYSQLLIBdir= $(libdir) |
| 430 |
+-pkgplugindir = $(pkglibdir)/plugin |
| 431 |
++MYSQLDATAdir = $(localstatedir) |
| 432 |
++MYSQLSHAREdir = $(pkgdatadir) |
| 433 |
++MYSQLBASEdir = $(prefix) |
| 434 |
++MYSQLLIBdir = $(libdir) |
| 435 |
++pkgplugindir = $(pkglibdir)/plugin |
| 436 |
+ |
| 437 |
+-EXTRA_DIST = libmysqld.def CMakeLists.txt |
| 438 |
+-DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ |
| 439 |
++EXTRA_DIST = libmysqld.def CMakeLists.txt |
| 440 |
++DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ |
| 441 |
+ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ |
| 442 |
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ |
| 443 |
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ |
| 444 |
+ -DPLUGINDIR="\"$(pkgplugindir)\"" |
| 445 |
+-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ |
| 446 |
++INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ |
| 447 |
+ -I$(top_builddir)/sql -I$(top_srcdir)/sql \ |
| 448 |
+ -I$(top_srcdir)/sql/examples \ |
| 449 |
+ -I$(top_srcdir)/regex \ |
| 450 |
+- $(openssl_includes) @ZLIB_INCLUDES@ \ |
| 451 |
+- @condition_dependent_plugin_includes@ |
| 452 |
++ $(openssl_includes) $(ZLIB_INCLUDES) \ |
| 453 |
++ @condition_dependent_plugin_includes@ \ |
| 454 |
++ $(ndbcluster_includes) |
| 455 |
+ |
| 456 |
+-noinst_LIBRARIES = libmysqld_int.a |
| 457 |
+-pkglib_LIBRARIES = libmysqld.a |
| 458 |
+-SUBDIRS = . examples |
| 459 |
++pkglib_LTLIBRARIES = libmysqld.la |
| 460 |
++SUBDIRS = . examples |
| 461 |
+ libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc |
| 462 |
+ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ |
| 463 |
+- my_time.c |
| 464 |
++ my_time.c |
| 465 |
+ |
| 466 |
+ noinst_HEADERS = embedded_priv.h emb_qcache.h |
| 467 |
+ |
| 468 |
+-sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ |
| 469 |
+- ha_ndbcluster.cc ha_ndbcluster_cond.cc \ |
| 470 |
+- ha_ndbcluster_binlog.cc ha_partition.cc \ |
| 471 |
+- handler.cc sql_handler.cc \ |
| 472 |
+- hostname.cc init.cc password.c \ |
| 473 |
+- item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ |
| 474 |
+- item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ |
| 475 |
+- item_geofunc.cc item_subselect.cc item_row.cc\ |
| 476 |
+- item_xmlfunc.cc \ |
| 477 |
+- key.cc lock.cc log.cc sql_state.c \ |
| 478 |
+- log_event.cc rpl_record.cc \ |
| 479 |
+- log_event_old.cc rpl_record_old.cc \ |
| 480 |
+- protocol.cc net_serv.cc opt_range.cc \ |
| 481 |
+- opt_sum.cc procedure.cc records.cc sql_acl.cc \ |
| 482 |
+- sql_load.cc discover.cc sql_locale.cc \ |
| 483 |
+- sql_profile.cc \ |
| 484 |
+- sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ |
| 485 |
+- sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ |
| 486 |
+- sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \ |
| 487 |
+- scheduler.cc sql_connect.cc sql_parse.cc \ |
| 488 |
+- sql_prepare.cc sql_derived.cc sql_rename.cc \ |
| 489 |
+- sql_select.cc sql_do.cc sql_show.cc set_var.cc \ |
| 490 |
+- sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ |
| 491 |
+- sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ |
| 492 |
+- unireg.cc uniques.cc sql_union.cc hash_filo.cc \ |
| 493 |
+- spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ |
| 494 |
+- sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ |
| 495 |
+- parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ |
| 496 |
+- rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ |
| 497 |
+- debug_sync.cc \ |
| 498 |
+- sql_tablespace.cc \ |
| 499 |
+- rpl_injector.cc my_user.c partition_info.cc \ |
| 500 |
+- sql_servers.cc event_parse_data.cc |
| 501 |
+- |
| 502 |
+-libmysqld_int_a_SOURCES= $(libmysqld_sources) |
| 503 |
+-nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) |
| 504 |
+-libmysqld_a_SOURCES= |
| 505 |
+- |
| 506 |
+-sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES) |
| 507 |
+-storagesources = @condition_dependent_plugin_modules@ |
| 508 |
+-storageobjects = @condition_dependent_plugin_objects@ |
| 509 |
+-storagesourceslinks = @condition_dependent_plugin_links@ |
| 510 |
++sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ |
| 511 |
++ ha_ndbcluster.cc ha_ndbcluster_cond.cc \ |
| 512 |
++ ha_ndbcluster_binlog.cc ha_partition.cc \ |
| 513 |
++ handler.cc sql_handler.cc \ |
| 514 |
++ hostname.cc init.cc password.c \ |
| 515 |
++ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ |
| 516 |
++ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ |
| 517 |
++ item_geofunc.cc item_subselect.cc item_row.cc\ |
| 518 |
++ item_xmlfunc.cc \ |
| 519 |
++ key.cc lock.cc log.cc sql_state.c \ |
| 520 |
++ log_event.cc rpl_record.cc \ |
| 521 |
++ log_event_old.cc rpl_record_old.cc \ |
| 522 |
++ protocol.cc net_serv.cc opt_range.cc \ |
| 523 |
++ opt_sum.cc procedure.cc records.cc sql_acl.cc \ |
| 524 |
++ sql_load.cc discover.cc sql_locale.cc \ |
| 525 |
++ sql_profile.cc \ |
| 526 |
++ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ |
| 527 |
++ sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ |
| 528 |
++ sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \ |
| 529 |
++ scheduler.cc sql_connect.cc sql_parse.cc \ |
| 530 |
++ sql_prepare.cc sql_derived.cc sql_rename.cc \ |
| 531 |
++ sql_select.cc sql_do.cc sql_show.cc set_var.cc \ |
| 532 |
++ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ |
| 533 |
++ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ |
| 534 |
++ unireg.cc uniques.cc sql_union.cc hash_filo.cc \ |
| 535 |
++ spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ |
| 536 |
++ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ |
| 537 |
++ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ |
| 538 |
++ rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ |
| 539 |
++ debug_sync.cc \ |
| 540 |
++ sql_tablespace.cc \ |
| 541 |
++ rpl_injector.cc my_user.c partition_info.cc \ |
| 542 |
++ sql_servers.cc event_parse_data.cc |
| 543 |
+ |
| 544 |
+ # automake misses these |
| 545 |
+ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy |
| 546 |
+ |
| 547 |
+ # The following libraries should be included in libmysqld.a |
| 548 |
+-INC_LIB= $(top_builddir)/regex/libregex.a \ |
| 549 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 550 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 551 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 552 |
+- $(top_builddir)/vio/libvio.a \ |
| 553 |
+- @NDB_SCI_LIBS@ \ |
| 554 |
+- @mysql_plugin_libs@ \ |
| 555 |
+- $(yassl_inc_libs) |
| 556 |
++INC_LIB= $(top_builddir)/regex/libregex.la \ |
| 557 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 558 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 559 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 560 |
++ $(top_builddir)/vio/libvio.la \ |
| 561 |
++ @ZLIB_LIBS@ @LIBDL@ \ |
| 562 |
++ $(NDB_SCI_LIBS) \ |
| 563 |
++ $(mysql_embedded_plugin_libs) \ |
| 564 |
++ $(yassl_inc_libs) |
| 565 |
+ |
| 566 |
+ if HAVE_YASSL |
| 567 |
+-yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \ |
| 568 |
+- $(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a |
| 569 |
++yassl_inc_libs= $(top_builddir)/extra/yassl/src/libyassl.la \ |
| 570 |
++ $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la |
| 571 |
+ endif |
| 572 |
+ |
| 573 |
++libmysqld_la_SOURCES= $(libmysqld_sources) |
| 574 |
++nodist_libmysqld_la_SOURCES= $(libmysqlsources) $(sqlsources) |
| 575 |
++libmysqld_la_LIBADD = $(INC_LIB) |
| 576 |
++ |
| 577 |
+ # Storage engine specific compilation options |
| 578 |
+ ha_ndbcluster.o:ha_ndbcluster.cc |
| 579 |
+ $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< |
| 580 |
+@@ -139,44 +135,6 @@ ha_myisam.o:ha_myisam.cc |
| 581 |
+ ha_myisammrg.o:ha_myisammrg.cc |
| 582 |
+ $(CXXCOMPILE) $(LM_CFLAGS) -c $< |
| 583 |
+ |
| 584 |
+-# |
| 585 |
+-# To make it easy for the end user to use the embedded library we |
| 586 |
+-# generate a total libmysqld.a from all library files, |
| 587 |
+- |
| 588 |
+-# note - InnoDB libraries have circular dependencies, so in INC_LIB |
| 589 |
+-# few libraries are present two times. Metrowerks linker doesn't like |
| 590 |
+-# it at all. Traditional ar has no problems with it, but still there's no |
| 591 |
+-# need to add the same file twice to the library, so 'sort -u' save us |
| 592 |
+-# some time and spares unnecessary work. |
| 593 |
+- |
| 594 |
+-libmysqld.a: libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects) |
| 595 |
+-if DARWIN_MWCC |
| 596 |
+- mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects) |
| 597 |
+-else |
| 598 |
+- -rm -f libmysqld.a |
| 599 |
+- if test "$(host_os)" = "netware" ; \ |
| 600 |
+- then \ |
| 601 |
+- $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \ |
| 602 |
+- else \ |
| 603 |
+- current_dir=`pwd`; \ |
| 604 |
+- rm -rf tmp; mkdir tmp; \ |
| 605 |
+- (for arc in $(INC_LIB) ./libmysqld_int.a; do \ |
| 606 |
+- arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \ |
| 607 |
+- artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \ |
| 608 |
+- for F in `$(AR) t $$arc | grep -v SYMDEF`; do \ |
| 609 |
+- if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \ |
| 610 |
+- mkdir $$artmp; cd $$artmp > /dev/null; \ |
| 611 |
+- $(AR) x ../../$$arc; \ |
| 612 |
+- cd $$current_dir > /dev/null; \ |
| 613 |
+- ls $$artmp/* | grep -v SYMDEF; \ |
| 614 |
+- continue 2; fi; done; \ |
| 615 |
+- done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \ |
| 616 |
+- $(AR) r libmysqld.a $(storageobjects); \ |
| 617 |
+- $(RANLIB) libmysqld.a ; \ |
| 618 |
+- rm -rf tmp; \ |
| 619 |
+- fi |
| 620 |
+-endif |
| 621 |
+- |
| 622 |
+ ## XXX: any time the client interface changes, we'll need to bump |
| 623 |
+ ## the version info for libmysqld; however, it's possible for the |
| 624 |
+ ## libmysqld interface to change without affecting the standard |
| 625 |
+@@ -187,7 +145,7 @@ endif |
| 626 |
+ |
| 627 |
+ BUILT_SOURCES = link_sources |
| 628 |
+ |
| 629 |
+-CLEANFILES = $(BUILT_SOURCES) |
| 630 |
++CLEANFILES = libmysqld.la |
| 631 |
+ |
| 632 |
+ link_sources: |
| 633 |
+ for f in $(sqlsources); do \ |
| 634 |
+@@ -208,20 +166,6 @@ link_sources: |
| 635 |
+ @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \ |
| 636 |
+ fi ; \ |
| 637 |
+ done; \ |
| 638 |
+- if test -n "$(sqlstoragesources)" ; \ |
| 639 |
+- then \ |
| 640 |
+- for f in "$(sqlstoragesources)"; do \ |
| 641 |
+- rm -f "$$f"; \ |
| 642 |
+- @LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \ |
| 643 |
+- done; \ |
| 644 |
+- fi; \ |
| 645 |
+- if test -n "$(storagesources)" ; \ |
| 646 |
+- then \ |
| 647 |
+- rm -f $(storagesources); \ |
| 648 |
+- for f in $(storagesourceslinks); do \ |
| 649 |
+- @LN_CP_F@ $(top_srcdir)/$$f . ; \ |
| 650 |
+- done; \ |
| 651 |
+- fi; \ |
| 652 |
+ rm -f client_settings.h; \ |
| 653 |
+ @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h \ |
| 654 |
+ client_settings.h; \ |
| 655 |
+@@ -229,7 +173,7 @@ link_sources: |
| 656 |
+ |
| 657 |
+ |
| 658 |
+ clean-local: |
| 659 |
+- rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \ |
| 660 |
++ rm -f `echo $(sqlsources) $(libmysqlsources) | sed "s;\.lo;.c;g"`; \ |
| 661 |
+ rm -f client_settings.h |
| 662 |
+ |
| 663 |
+ # Don't update the files from bitkeeper |
| 664 |
+Index: libmysqld/examples/Makefile.am |
| 665 |
+=================================================================== |
| 666 |
+--- libmysqld/examples/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 667 |
++++ libmysqld/examples/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 668 |
+@@ -37,12 +37,16 @@ INCLUDES = -I$(top_builddir)/include -I$ |
| 669 |
+ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ |
| 670 |
+ $(openssl_includes) |
| 671 |
+ LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) |
| 672 |
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ |
| 673 |
+- @NDB_SCI_LIBS@ |
| 674 |
++LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \ |
| 675 |
++ @NDB_SCI_LIBS@ \ |
| 676 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 677 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 678 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 679 |
++ $(ZLIB_LIBS) |
| 680 |
+ |
| 681 |
+ mysqltest_embedded_LINK = $(CXXLINK) |
| 682 |
+ nodist_mysqltest_embedded_SOURCES = mysqltest.cc |
| 683 |
+-mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a \ |
| 684 |
++mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.la \ |
| 685 |
+ @MYSQLD_EXTRA_LDFLAGS@ |
| 686 |
+ |
| 687 |
+ nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ |
| 688 |
+Index: mysys/Makefile.am |
| 689 |
+=================================================================== |
| 690 |
+--- mysys/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 691 |
++++ mysys/Makefile.am 2010-11-27 19:42:49.000000000 +0100 |
| 692 |
+@@ -18,10 +18,10 @@ MYSQLSHAREdir = $(pkgdatadir) |
| 693 |
+ MYSQLBASEdir= $(prefix) |
| 694 |
+ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ |
| 695 |
+ -I$(top_srcdir)/include -I$(srcdir) |
| 696 |
+-pkglib_LIBRARIES = libmysys.a |
| 697 |
+-LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a |
| 698 |
++noinst_LTLIBRARIES = libmysys.la |
| 699 |
++LDADD = libmysys.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la |
| 700 |
+ noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h |
| 701 |
+-libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ |
| 702 |
++libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ |
| 703 |
+ mf_path.c mf_loadpath.c my_file.c \ |
| 704 |
+ my_open.c my_create.c my_dup.c my_seek.c my_read.c \ |
| 705 |
+ my_pread.c my_write.c my_getpagesize.c \ |
| 706 |
+@@ -57,18 +57,18 @@ if NEED_THREAD |
| 707 |
+ # mf_keycache is used only in the server, so it is safe to leave the file |
| 708 |
+ # out of the non-threaded library. |
| 709 |
+ # In fact, it will currently not compile without thread support. |
| 710 |
+-libmysys_a_SOURCES += mf_keycache.c |
| 711 |
++libmysys_la_SOURCES += thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c \ |
| 712 |
++ my_pthread.c my_thr_init.c mf_keycache.c |
| 713 |
+ endif |
| 714 |
+ |
| 715 |
+ EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ |
| 716 |
+ thr_mutex.c thr_rwlock.c \ |
| 717 |
+ CMakeLists.txt mf_soundex.c \ |
| 718 |
+ my_conio.c my_wincond.c my_winthread.c |
| 719 |
+-libmysys_a_LIBADD = @THREAD_LOBJECTS@ |
| 720 |
+-# test_dir_DEPENDENCIES= $(LIBRARIES) |
| 721 |
+-# testhash_DEPENDENCIES= $(LIBRARIES) |
| 722 |
+-# test_charset_DEPENDENCIES= $(LIBRARIES) |
| 723 |
+-# charset2html_DEPENDENCIES= $(LIBRARIES) |
| 724 |
++# test_dir_DEPENDENCIES= $(LTLIBRARIES) |
| 725 |
++# testhash_DEPENDENCIES= $(LTLIBRARIES) |
| 726 |
++# test_charset_DEPENDENCIES= $(LTLIBRARIES) |
| 727 |
++# charset2html_DEPENDENCIES= $(LTLIBRARIES) |
| 728 |
+ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ |
| 729 |
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ |
| 730 |
+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ |
| 731 |
+@@ -78,8 +78,6 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" |
| 732 |
+ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ |
| 733 |
+ @DEFS@ |
| 734 |
+ |
| 735 |
+-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ |
| 736 |
+- |
| 737 |
+ # I hope this always does the right thing. Otherwise this is only test programs |
| 738 |
+ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ |
| 739 |
+ |
| 740 |
+@@ -88,47 +86,47 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $( |
| 741 |
+ # which automaticly removes the object files you use to compile a final program |
| 742 |
+ # |
| 743 |
+ |
| 744 |
+-test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES) |
| 745 |
++test_bitmap$(EXEEXT): my_bitmap.c $(LTLIBRARIES) |
| 746 |
+ $(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS) |
| 747 |
+ |
| 748 |
+-test_priority_queue$(EXEEXT): queues.c $(LIBRARIES) |
| 749 |
++test_priority_queue$(EXEEXT): queues.c $(LTLIBRARIES) |
| 750 |
+ $(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS) |
| 751 |
+ |
| 752 |
+-test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES) |
| 753 |
++test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES) |
| 754 |
+ $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c |
| 755 |
+ $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS) |
| 756 |
+ $(RM) -f ./test_thr_alarm.c |
| 757 |
+ |
| 758 |
+-test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES) |
| 759 |
++test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES) |
| 760 |
+ $(CP) $(srcdir)/thr_lock.c test_thr_lock.c |
| 761 |
+ $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS) |
| 762 |
+ $(RM) -f ./test_thr_lock.c |
| 763 |
+ |
| 764 |
+-test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES) |
| 765 |
++test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES) |
| 766 |
+ $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c |
| 767 |
+ $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS) |
| 768 |
+ $(RM) -f test_vsnprintf.c |
| 769 |
+ |
| 770 |
+-test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES) |
| 771 |
++test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES) |
| 772 |
+ $(CP) $(srcdir)/mf_iocache.c test_io_cache.c |
| 773 |
+ $(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS) |
| 774 |
+ $(RM) -f test_io_cache.c |
| 775 |
+ |
| 776 |
+-test_dir$(EXEEXT): test_dir.c $(LIBRARIES) |
| 777 |
++test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES) |
| 778 |
+ $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) |
| 779 |
+ |
| 780 |
+-test_charset$(EXEEXT): test_charset.c $(LIBRARIES) |
| 781 |
++test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES) |
| 782 |
+ $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) |
| 783 |
+ |
| 784 |
+-testhash$(EXEEXT): testhash.c $(LIBRARIES) |
| 785 |
++testhash$(EXEEXT): testhash.c $(LTLIBRARIES) |
| 786 |
+ $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS) |
| 787 |
+ |
| 788 |
+-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES) |
| 789 |
++test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES) |
| 790 |
+ $(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c |
| 791 |
+ $(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS) |
| 792 |
+ $(RM) -f ./test_gethwaddr.c |
| 793 |
+ |
| 794 |
+-test_base64$(EXEEXT): base64.c $(LIBRARIES) |
| 795 |
++test_base64$(EXEEXT): base64.c $(LTLIBRARIES) |
| 796 |
+ $(CP) $(srcdir)/base64.c ./test_base64.c |
| 797 |
+ $(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS) |
| 798 |
+ $(RM) -f ./test_base64.c |
| 799 |
+Index: netware/BUILD/compile-linux-tools |
| 800 |
+=================================================================== |
| 801 |
+--- netware/BUILD/compile-linux-tools.orig 2010-11-27 15:02:45.000000000 +0100 |
| 802 |
++++ netware/BUILD/compile-linux-tools 2010-11-27 15:02:49.000000000 +0100 |
| 803 |
+@@ -34,14 +34,14 @@ make |
| 804 |
+ # Create mysql_version.h which was deleted my previous step |
| 805 |
+ ./config.status include/mysql_version.h |
| 806 |
+ |
| 807 |
+-(cd dbug; make libdbug.a) |
| 808 |
+-(cd strings; make libmystrings.a) |
| 809 |
+-(cd mysys; make libmysys.a) |
| 810 |
+-(cd storage/heap; make libheap.a) |
| 811 |
+-(cd vio; make libvio.a) |
| 812 |
+-(cd regex; make libregex.a) |
| 813 |
+-(cd storage/myisam; make libmyisam.a) |
| 814 |
+-(cd storage/myisammrg; make libmyisammrg.a) |
| 815 |
++(cd dbug; make libdbug.la) |
| 816 |
++(cd strings; make libmystrings.la) |
| 817 |
++(cd mysys; make libmysys.la) |
| 818 |
++(cd storage/heap; make libheap.la) |
| 819 |
++(cd vio; make libvio.la) |
| 820 |
++(cd regex; make libregex.la) |
| 821 |
++(cd storage/myisam; make libmyisam.la) |
| 822 |
++(cd storage/myisammrg; make libmyisammrg.la) |
| 823 |
+ (cd extra; make comp_err) |
| 824 |
+ (cd libmysql; make conf_to_src) |
| 825 |
+ (cd libmysql_r; make conf_to_src) |
| 826 |
+Index: netware/Makefile.am |
| 827 |
+=================================================================== |
| 828 |
+--- netware/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 829 |
++++ netware/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 830 |
+@@ -16,8 +16,8 @@ |
| 831 |
+ |
| 832 |
+ if HAVE_NETWARE |
| 833 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. |
| 834 |
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ |
| 835 |
+- ../dbug/libdbug.a ../strings/libmystrings.a |
| 836 |
++LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \ |
| 837 |
++ ../dbug/libdbug.la ../strings/libmystrings.la |
| 838 |
+ bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql |
| 839 |
+ mysqld_safe_SOURCES= mysqld_safe.c my_manage.c |
| 840 |
+ mysql_install_db_SOURCES= mysql_install_db.c my_manage.c |
| 841 |
+Index: regex/Makefile.am |
| 842 |
+=================================================================== |
| 843 |
+--- regex/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 844 |
++++ regex/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 845 |
+@@ -16,10 +16,10 @@ |
| 846 |
+ # MA 02111-1307, USA |
| 847 |
+ |
| 848 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include |
| 849 |
+-noinst_LIBRARIES = libregex.a |
| 850 |
+-LDADD= libregex.a $(top_builddir)/strings/libmystrings.a |
| 851 |
++noinst_LTLIBRARIES = libregex.la |
| 852 |
++LDADD= libregex.la $(top_builddir)/strings/libmystrings.la |
| 853 |
+ noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h |
| 854 |
+-libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c |
| 855 |
++libregex_la_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c |
| 856 |
+ noinst_PROGRAMS = re |
| 857 |
+ re_SOURCES = split.c debug.c main.c |
| 858 |
+ re_LDFLAGS= @NOINST_LDFLAGS@ |
| 859 |
+Index: server-tools/instance-manager/Makefile.am |
| 860 |
+=================================================================== |
| 861 |
+--- server-tools/instance-manager/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 862 |
++++ server-tools/instance-manager/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 863 |
+@@ -87,10 +87,10 @@ mysqlmanager_SOURCES= command.cc command |
| 864 |
+ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ |
| 865 |
+ liboptions.la \ |
| 866 |
+ libnet.a \ |
| 867 |
+- $(top_builddir)/vio/libvio.a \ |
| 868 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 869 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 870 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 871 |
++ $(top_builddir)/vio/libvio.la \ |
| 872 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 873 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 874 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 875 |
+ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ |
| 876 |
+ |
| 877 |
+ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ |
| 878 |
+Index: sql/Makefile.am |
| 879 |
+=================================================================== |
| 880 |
+--- sql/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 881 |
++++ sql/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 882 |
+@@ -32,13 +32,13 @@ bin_PROGRAMS = mysql_tzinfo_to_sql |
| 883 |
+ noinst_LTLIBRARIES= libndb.la \ |
| 884 |
+ udf_example.la |
| 885 |
+ |
| 886 |
+-SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ |
| 887 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 888 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 889 |
+- $(top_builddir)/regex/libregex.a \ |
| 890 |
+- $(top_builddir)/strings/libmystrings.a |
| 891 |
++SUPPORTING_LIBS = $(top_builddir)/vio/libvio.la \ |
| 892 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 893 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 894 |
++ $(top_builddir)/regex/libregex.la \ |
| 895 |
++ $(top_builddir)/strings/libmystrings.la |
| 896 |
+ mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la |
| 897 |
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ |
| 898 |
++LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ $(openssl_libs) $(yassl_libs) |
| 899 |
+ mysqld_LDADD = libndb.la \ |
| 900 |
+ @MYSQLD_EXTRA_LDFLAGS@ \ |
| 901 |
+ @pstack_libs@ \ |
| 902 |
+Index: storage/archive/Makefile.am |
| 903 |
+=================================================================== |
| 904 |
+--- storage/archive/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 905 |
++++ storage/archive/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 906 |
+@@ -33,7 +33,7 @@ DEFS = @DEFS@ |
| 907 |
+ noinst_HEADERS = ha_archive.h azlib.h |
| 908 |
+ noinst_PROGRAMS = archive_test archive_reader |
| 909 |
+ |
| 910 |
+-EXTRA_LTLIBRARIES = ha_archive.la |
| 911 |
++EXTRA_LTLIBRARIES = libarchive.la ha_archive.la |
| 912 |
+ pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ |
| 913 |
+ ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) |
| 914 |
+ ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
| 915 |
+@@ -41,26 +41,25 @@ ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMY |
| 916 |
+ ha_archive_la_SOURCES = ha_archive.cc azio.c |
| 917 |
+ |
| 918 |
+ |
| 919 |
+-EXTRA_LIBRARIES = libarchive.a |
| 920 |
+-noinst_LIBRARIES = @plugin_archive_static_target@ |
| 921 |
+-libarchive_a_CXXFLAGS = $(AM_CXXFLAGS) |
| 922 |
+-libarchive_a_CFLAGS = $(AM_CFLAGS) |
| 923 |
+-libarchive_a_SOURCES = ha_archive.cc azio.c |
| 924 |
++noinst_LTLIBRARIES = @plugin_archive_static_target@ |
| 925 |
++libarchive_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 926 |
++libarchive_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 927 |
++libarchive_la_SOURCES = ha_archive.cc azio.c |
| 928 |
+ |
| 929 |
+ |
| 930 |
+ archive_test_SOURCES = archive_test.c azio.c |
| 931 |
+ archive_test_CFLAGS = $(AM_CFLAGS) |
| 932 |
+-archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \ |
| 933 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 934 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 935 |
++archive_test_LDADD = $(top_builddir)/mysys/libmysys.la \ |
| 936 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 937 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 938 |
+ @ZLIB_LIBS@ |
| 939 |
+ archive_test_LDFLAGS = @NOINST_LDFLAGS@ |
| 940 |
+ |
| 941 |
+ archive_reader_SOURCES = archive_reader.c azio.c |
| 942 |
+ archive_reader_CFLAGS = $(AM_CFLAGS) |
| 943 |
+-archive_reader_LDADD = $(top_builddir)/mysys/libmysys.a \ |
| 944 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 945 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 946 |
++archive_reader_LDADD = $(top_builddir)/mysys/libmysys.la \ |
| 947 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 948 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 949 |
+ @ZLIB_LIBS@ |
| 950 |
+ archive_reader_LDFLAGS = @NOINST_LDFLAGS@ |
| 951 |
+ |
| 952 |
+Index: storage/archive/plug.in |
| 953 |
+=================================================================== |
| 954 |
+--- storage/archive/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 955 |
++++ storage/archive/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 956 |
+@@ -1,4 +1,4 @@ |
| 957 |
+ MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine], |
| 958 |
+ [Archive Storage Engine], [max,max-no-ndb]) |
| 959 |
+-MYSQL_PLUGIN_STATIC(archive, [libarchive.a]) |
| 960 |
++MYSQL_PLUGIN_STATIC(archive, [libarchive.la]) |
| 961 |
+ MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la]) |
| 962 |
+Index: storage/blackhole/Makefile.am |
| 963 |
+=================================================================== |
| 964 |
+--- storage/blackhole/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 965 |
++++ storage/blackhole/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 966 |
+@@ -32,7 +32,7 @@ DEFS = @DEFS@ |
| 967 |
+ |
| 968 |
+ noinst_HEADERS = ha_blackhole.h |
| 969 |
+ |
| 970 |
+-EXTRA_LTLIBRARIES = ha_blackhole.la |
| 971 |
++EXTRA_LTLIBRARIES = libblackhole.la ha_blackhole.la |
| 972 |
+ pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ |
| 973 |
+ ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) |
| 974 |
+ ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
| 975 |
+@@ -40,11 +40,10 @@ ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DM |
| 976 |
+ ha_blackhole_la_SOURCES=ha_blackhole.cc |
| 977 |
+ |
| 978 |
+ |
| 979 |
+-EXTRA_LIBRARIES = libblackhole.a |
| 980 |
+-noinst_LIBRARIES = @plugin_blackhole_static_target@ |
| 981 |
+-libblackhole_a_CXXFLAGS=$(AM_CXXFLAGS) |
| 982 |
+-libblackhole_a_CFLAGS = $(AM_CFLAGS) |
| 983 |
+-libblackhole_a_SOURCES= ha_blackhole.cc |
| 984 |
++noinst_LTLIBRARIES = @plugin_blackhole_static_target@ |
| 985 |
++libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 986 |
++libblackhole_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 987 |
++libblackhole_la_SOURCES= ha_blackhole.cc |
| 988 |
+ |
| 989 |
+ |
| 990 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 991 |
+Index: storage/blackhole/plug.in |
| 992 |
+=================================================================== |
| 993 |
+--- storage/blackhole/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 994 |
++++ storage/blackhole/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 995 |
+@@ -1,6 +1,6 @@ |
| 996 |
+ MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine], |
| 997 |
+ [Basic Write-only Read-never tables], [max,max-no-ndb]) |
| 998 |
+ MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole]) |
| 999 |
+-MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.a]) |
| 1000 |
++MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.la]) |
| 1001 |
+ MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la]) |
| 1002 |
+ |
| 1003 |
+Index: storage/csv/Makefile.am |
| 1004 |
+=================================================================== |
| 1005 |
+--- storage/csv/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1006 |
++++ storage/csv/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1007 |
+@@ -29,16 +29,15 @@ LDADD = |
| 1008 |
+ DEFS = @DEFS@ |
| 1009 |
+ noinst_HEADERS = ha_tina.h transparent_file.h |
| 1010 |
+ |
| 1011 |
+-EXTRA_LTLIBRARIES = ha_csv.la |
| 1012 |
++EXTRA_LTLIBRARIES = libcsv.la ha_csv.la |
| 1013 |
+ pkglib_LTLIBRARIES = @plugin_csv_shared_target@ |
| 1014 |
+ ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) |
| 1015 |
+ ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN |
| 1016 |
+ ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc |
| 1017 |
+ |
| 1018 |
+-EXTRA_LIBRARIES = libcsv.a |
| 1019 |
+-noinst_LIBRARIES = @plugin_csv_static_target@ |
| 1020 |
+-libcsv_a_CXXFLAGS = $(AM_CXXFLAGS) |
| 1021 |
+-libcsv_a_SOURCES = transparent_file.cc ha_tina.cc |
| 1022 |
++noinst_LTLIBRARIES = @plugin_csv_static_target@ |
| 1023 |
++libcsv_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1024 |
++libcsv_la_SOURCES = transparent_file.cc ha_tina.cc |
| 1025 |
+ |
| 1026 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 1027 |
+ # Don't update the files from bitkeeper |
| 1028 |
+Index: storage/csv/plug.in |
| 1029 |
+=================================================================== |
| 1030 |
+--- storage/csv/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1031 |
++++ storage/csv/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1032 |
+@@ -1,5 +1,5 @@ |
| 1033 |
+ MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine], |
| 1034 |
+ [Stores tables in text CSV format]) |
| 1035 |
+ MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv]) |
| 1036 |
+-MYSQL_PLUGIN_STATIC(csv, [libcsv.a]) |
| 1037 |
++MYSQL_PLUGIN_STATIC(csv, [libcsv.la]) |
| 1038 |
+ MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging |
| 1039 |
+Index: storage/example/Makefile.am |
| 1040 |
+=================================================================== |
| 1041 |
+--- storage/example/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1042 |
++++ storage/example/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1043 |
+@@ -32,7 +32,7 @@ DEFS = @DEFS@ |
| 1044 |
+ |
| 1045 |
+ noinst_HEADERS = ha_example.h |
| 1046 |
+ |
| 1047 |
+-EXTRA_LTLIBRARIES = ha_example.la |
| 1048 |
++EXTRA_LTLIBRARIES = libexample.la ha_example.la |
| 1049 |
+ pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ |
| 1050 |
+ ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) |
| 1051 |
+ ha_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
| 1052 |
+@@ -40,11 +40,10 @@ ha_example_la_CFLAGS = $(AM_CFLAGS) -DMY |
| 1053 |
+ ha_example_la_SOURCES = ha_example.cc |
| 1054 |
+ |
| 1055 |
+ |
| 1056 |
+-EXTRA_LIBRARIES = libexample.a |
| 1057 |
+-noinst_LIBRARIES = @plugin_example_static_target@ |
| 1058 |
+-libexample_a_CXXFLAGS = $(AM_CXXFLAGS) |
| 1059 |
+-libexample_a_CFLAGS = $(AM_CFLAGS) |
| 1060 |
+-libexample_a_SOURCES= ha_example.cc |
| 1061 |
++noinst_LTLIBRARIES = @plugin_example_static_target@ |
| 1062 |
++libexample_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1063 |
++libexample_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1064 |
++libexample_la_SOURCES= ha_example.cc |
| 1065 |
+ |
| 1066 |
+ |
| 1067 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 1068 |
+Index: storage/federated/Makefile.am |
| 1069 |
+=================================================================== |
| 1070 |
+--- storage/federated/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1071 |
++++ storage/federated/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1072 |
+@@ -32,7 +32,7 @@ DEFS = @DEFS@ |
| 1073 |
+ |
| 1074 |
+ noinst_HEADERS = ha_federated.h |
| 1075 |
+ |
| 1076 |
+-EXTRA_LTLIBRARIES = ha_federated.la |
| 1077 |
++EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la ha_federated.la |
| 1078 |
+ pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ |
| 1079 |
+ ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) |
| 1080 |
+ ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN |
| 1081 |
+@@ -40,11 +40,14 @@ ha_federated_la_CFLAGS = $(AM_CFLAGS) -D |
| 1082 |
+ ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c |
| 1083 |
+ |
| 1084 |
+ |
| 1085 |
+-EXTRA_LIBRARIES = libfederated.a |
| 1086 |
+-noinst_LIBRARIES = @plugin_federated_static_target@ |
| 1087 |
+-libfederated_a_CXXFLAGS = $(AM_CXXFLAGS) |
| 1088 |
+-libfederated_a_CFLAGS = $(AM_CFLAGS) |
| 1089 |
+-libfederated_a_SOURCES= ha_federated.cc $(top_srcdir)/mysys/string.c |
| 1090 |
++noinst_LTLIBRARIES = @plugin_federated_static_target@ @plugin_federated_embedded_static_target@ |
| 1091 |
++libfederated_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1092 |
++libfederated_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1093 |
++libfederated_la_SOURCES= ha_federated.cc $(top_srcdir)/mysys/string.c |
| 1094 |
++ |
| 1095 |
++libfederated_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@ |
| 1096 |
++libfederated_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ |
| 1097 |
++libfederated_embedded_la_SOURCES= ha_federated.cc $(top_srcdir)/mysys/string.c |
| 1098 |
+ |
| 1099 |
+ |
| 1100 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 1101 |
+Index: storage/federated/plug.in |
| 1102 |
+=================================================================== |
| 1103 |
+--- storage/federated/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1104 |
++++ storage/federated/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1105 |
+@@ -1,5 +1,4 @@ |
| 1106 |
+ MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine], |
| 1107 |
+ [Connects to tables on remote MySQL servers], [max,max-no-ndb]) |
| 1108 |
+-MYSQL_PLUGIN_STATIC(federated, [libfederated.a]) |
| 1109 |
++MYSQL_PLUGIN_STATIC(federated, [libfederated.la], [libfederated_embedded.la]) |
| 1110 |
+ MYSQL_PLUGIN_DYNAMIC(federated, [ha_federated.la]) |
| 1111 |
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc]) |
| 1112 |
+Index: storage/heap/Makefile.am |
| 1113 |
+=================================================================== |
| 1114 |
+--- storage/heap/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1115 |
++++ storage/heap/Makefile.am 2010-11-27 19:44:23.000000000 +0100 |
| 1116 |
+@@ -26,27 +26,40 @@ WRAPLIBS= |
| 1117 |
+ LDADD = |
| 1118 |
+ |
| 1119 |
+ DEFS = @DEFS@ |
| 1120 |
+-pkglib_LIBRARIES = libheap.a |
| 1121 |
++noinst_LTLIBRARIES = libheap.la libheap_s.la libheap_common.la \ |
| 1122 |
++ @plugin_heap_embedded_static_target@ |
| 1123 |
++EXTRA_LTLIBRARIES = libheap_embedded.la |
| 1124 |
++ |
| 1125 |
+ noinst_PROGRAMS = hp_test1 hp_test2 |
| 1126 |
+-noinst_LIBRARIES = libheap.a |
| 1127 |
+ hp_test1_LDFLAGS = @NOINST_LDFLAGS@ |
| 1128 |
+-hp_test1_LDADD = libheap.a \ |
| 1129 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1130 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1131 |
+- $(top_builddir)/strings/libmystrings.a |
| 1132 |
++hp_test1_LDADD = libheap.la \ |
| 1133 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1134 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1135 |
++ $(top_builddir)/strings/libmystrings.la |
| 1136 |
+ hp_test2_LDFLAGS = @NOINST_LDFLAGS@ |
| 1137 |
+-hp_test2_LDADD = libheap.a \ |
| 1138 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1139 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1140 |
+- $(top_builddir)/strings/libmystrings.a |
| 1141 |
++hp_test2_LDADD = libheap.la \ |
| 1142 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1143 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1144 |
++ $(top_builddir)/strings/libmystrings.la |
| 1145 |
+ noinst_HEADERS = heapdef.h ha_heap.h |
| 1146 |
+-libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ |
| 1147 |
++libheap_common_la_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ |
| 1148 |
+ hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ |
| 1149 |
+ hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \ |
| 1150 |
+ hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \ |
| 1151 |
+ hp_rkey.c hp_block.c \ |
| 1152 |
+- ha_heap.cc \ |
| 1153 |
+ hp_hash.c _check.c _rectest.c hp_static.c |
| 1154 |
++libheap_common_la_CFLAGS = $(AM_LDFLAGS) @plugin_static_if_no_embedded@ |
| 1155 |
++ |
| 1156 |
++libheap_s_la_SOURCES = ha_heap.cc |
| 1157 |
++libheap_s_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1158 |
++libheap_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1159 |
++libheap_s_la_LIBADD = libheap_common.la |
| 1160 |
++libheap_embedded_la_SOURCES = ha_heap.cc |
| 1161 |
++libheap_embedded_la_LIBADD = libheap_common.la |
| 1162 |
++libheap_embedded_la_CXXFLAGS = @plugin_embedded_defs@ |
| 1163 |
++libheap_la_SOURCES = |
| 1164 |
++libheap_la_LIBADD = libheap_s.la |
| 1165 |
++libheap_la_LDFLAGS = -static |
| 1166 |
+ |
| 1167 |
+ |
| 1168 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 1169 |
+Index: storage/heap/plug.in |
| 1170 |
+=================================================================== |
| 1171 |
+--- storage/heap/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1172 |
++++ storage/heap/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1173 |
+@@ -1,7 +1,6 @@ |
| 1174 |
+ MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine], |
| 1175 |
+ [Volatile memory based tables]) |
| 1176 |
+ MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap]) |
| 1177 |
+-MYSQL_PLUGIN_STATIC(heap, [libheap.a]) |
| 1178 |
++MYSQL_PLUGIN_STATIC(heap, [libheap_s.la], [libheap_embedded.la]) |
| 1179 |
+ MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables |
| 1180 |
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc]) |
| 1181 |
+ |
| 1182 |
+Index: storage/innobase/Makefile.am |
| 1183 |
+=================================================================== |
| 1184 |
+--- storage/innobase/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1185 |
++++ storage/innobase/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1186 |
+@@ -15,21 +15,20 @@ |
| 1187 |
+ |
| 1188 |
+ # Process this file with automake to create Makefile.in |
| 1189 |
+ |
| 1190 |
+-MYSQLDATAdir= $(localstatedir) |
| 1191 |
+-MYSQLSHAREdir= $(pkgdatadir) |
| 1192 |
+-MYSQLBASEdir= $(prefix) |
| 1193 |
+-MYSQLLIBdir= $(pkglibdir) |
| 1194 |
+-pkgplugindir= $(pkglibdir)/plugin |
| 1195 |
+-INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \ |
| 1196 |
++MYSQLDATAdir = $(localstatedir) |
| 1197 |
++MYSQLSHAREdir = $(pkgdatadir) |
| 1198 |
++MYSQLBASEdir = $(prefix) |
| 1199 |
++MYSQLLIBdir = $(pkglibdir) |
| 1200 |
++pkgplugindir = $(pkglibdir)/plugin |
| 1201 |
++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ |
| 1202 |
+ -I$(top_srcdir)/regex \ |
| 1203 |
+ -I$(top_srcdir)/storage/innobase/include \ |
| 1204 |
+ -I$(top_srcdir)/sql \ |
| 1205 |
+ -I$(srcdir) |
| 1206 |
+ |
| 1207 |
+-DEFS= @DEFS@ |
| 1208 |
++DEFS= @DEFS@ |
| 1209 |
+ |
| 1210 |
+- |
| 1211 |
+-noinst_HEADERS= include/btr0btr.h include/btr0btr.ic \ |
| 1212 |
++noinst_HEADERS = include/btr0btr.h include/btr0btr.ic \ |
| 1213 |
+ include/btr0cur.h include/btr0cur.ic \ |
| 1214 |
+ include/btr0pcur.h include/btr0pcur.ic \ |
| 1215 |
+ include/btr0sea.h include/btr0sea.ic \ |
| 1216 |
+@@ -122,9 +121,8 @@ noinst_HEADERS= include/btr0btr.h inclu |
| 1217 |
+ include/ut0list.ic include/ut0wqueue.h \ |
| 1218 |
+ include/ha_prototypes.h handler/ha_innodb.h |
| 1219 |
+ |
| 1220 |
+-EXTRA_LIBRARIES= libinnobase.a |
| 1221 |
+-noinst_LIBRARIES= @plugin_innobase_static_target@ |
| 1222 |
+-libinnobase_a_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \ |
| 1223 |
++noinst_LTLIBRARIES = @plugin_innobase_static_target@ |
| 1224 |
++libinnobase_la_SOURCES = btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \ |
| 1225 |
+ btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c \ |
| 1226 |
+ buf/buf0lru.c buf/buf0rea.c data/data0data.c \ |
| 1227 |
+ data/data0type.c dict/dict0boot.c \ |
| 1228 |
+@@ -156,18 +154,18 @@ libinnobase_a_SOURCES= btr/btr0btr.c btr |
| 1229 |
+ ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \ |
| 1230 |
+ handler/ha_innodb.cc |
| 1231 |
+ |
| 1232 |
+-libinnobase_a_CXXFLAGS= $(AM_CXXFLAGS) |
| 1233 |
+-libinnobase_a_CFLAGS= $(AM_CFLAGS) |
| 1234 |
++libinnobase_la_CXXFLAGS = $(AM_CXXFLAGS) |
| 1235 |
++libinnobase_la_CFLAGS = $(AM_CFLAGS) |
| 1236 |
+ |
| 1237 |
+-EXTRA_LTLIBRARIES= ha_innodb.la |
| 1238 |
+-pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ |
| 1239 |
++EXTRA_LTLIBRARIES = libinnobase.la ha_innodb.la |
| 1240 |
++pkgplugin_LTLIBRARIES = @plugin_innobase_shared_target@ |
| 1241 |
+ |
| 1242 |
+-ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir) |
| 1243 |
+-ha_innodb_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1244 |
+-ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1245 |
+-ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES) |
| 1246 |
++ha_innodb_la_LDFLAGS = -module -rpath $(pkgplugindir) |
| 1247 |
++ha_innodb_la_CXXFLAGS = $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1248 |
++ha_innodb_la_CFLAGS = $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1249 |
++ha_innodb_la_SOURCES = $(libinnobase_la_SOURCES) |
| 1250 |
+ |
| 1251 |
+-EXTRA_DIST= CMakeLists.txt plug.in \ |
| 1252 |
++EXTRA_DIST = CMakeLists.txt plug.in \ |
| 1253 |
+ pars/make_bison.sh pars/make_flex.sh \ |
| 1254 |
+ pars/pars0grm.y pars/pars0lex.l |
| 1255 |
+ |
| 1256 |
+Index: storage/innobase/plug.in |
| 1257 |
+=================================================================== |
| 1258 |
+--- storage/innobase/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1259 |
++++ storage/innobase/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1260 |
+@@ -1,7 +1,7 @@ |
| 1261 |
+ MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine], |
| 1262 |
+ [Transactional Tables using InnoDB], [max,max-no-ndb]) |
| 1263 |
+ MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase]) |
| 1264 |
+-MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a]) |
| 1265 |
++MYSQL_PLUGIN_STATIC(innobase, [libinnobase.la]) |
| 1266 |
+ MYSQL_PLUGIN_DYNAMIC(innobase, [ha_innodb.la]) |
| 1267 |
+ MYSQL_PLUGIN_ACTIONS(innobase, [ |
| 1268 |
+ AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"]) |
| 1269 |
+Index: storage/innodb_plugin/Makefile.am |
| 1270 |
+=================================================================== |
| 1271 |
+--- storage/innodb_plugin/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1272 |
++++ storage/innodb_plugin/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1273 |
+@@ -228,9 +228,8 @@ noinst_HEADERS= \ |
| 1274 |
+ include/ut0wqueue.h \ |
| 1275 |
+ mem/mem0dbg.c |
| 1276 |
+ |
| 1277 |
+-EXTRA_LIBRARIES= libinnobase.a |
| 1278 |
+-noinst_LIBRARIES= @plugin_innodb_plugin_static_target@ |
| 1279 |
+-libinnobase_a_SOURCES= \ |
| 1280 |
++noinst_LTLIBRARIES= @plugin_innodb_plugin_static_target@ |
| 1281 |
++libinnobase_la_SOURCES= \ |
| 1282 |
+ btr/btr0btr.c \ |
| 1283 |
+ btr/btr0cur.c \ |
| 1284 |
+ btr/btr0pcur.c \ |
| 1285 |
+@@ -325,16 +324,16 @@ libinnobase_a_SOURCES= \ |
| 1286 |
+ ut/ut0vec.c \ |
| 1287 |
+ ut/ut0wqueue.c |
| 1288 |
+ |
| 1289 |
+-libinnobase_a_CXXFLAGS= $(AM_CXXFLAGS) |
| 1290 |
+-libinnobase_a_CFLAGS= $(AM_CFLAGS) |
| 1291 |
++libinnobase_la_CXXFLAGS= $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1292 |
++libinnobase_la_CFLAGS= $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1293 |
+ |
| 1294 |
+-EXTRA_LTLIBRARIES= ha_innodb_plugin.la |
| 1295 |
++EXTRA_LTLIBRARIES= libinnobase.la ha_innodb_plugin.la |
| 1296 |
+ pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ |
| 1297 |
+ |
| 1298 |
+ ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) |
| 1299 |
+ ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1300 |
+ ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) |
| 1301 |
+-ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) |
| 1302 |
++ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES) |
| 1303 |
+ |
| 1304 |
+ EXTRA_DIST= CMakeLists.txt plug.in \ |
| 1305 |
+ pars/make_bison.sh pars/make_flex.sh \ |
| 1306 |
+Index: storage/myisam/Makefile.am |
| 1307 |
+=================================================================== |
| 1308 |
+--- storage/myisam/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1309 |
++++ storage/myisam/Makefile.am 2010-11-27 19:44:01.000000000 +0100 |
| 1310 |
+@@ -30,60 +30,63 @@ DEFS = @DEFS@ |
| 1311 |
+ EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in |
| 1312 |
+ pkgdata_DATA = mi_test_all mi_test_all.res |
| 1313 |
+ |
| 1314 |
+-pkglib_LIBRARIES = libmyisam.a |
| 1315 |
++noinst_LTLIBRARIES = libmyisam.la libmyisam_common.la libmyisam_s.la \ |
| 1316 |
++ @plugin_myisam_embedded_static_target@ |
| 1317 |
++EXTRA_LTLIBRARIES = libmyisam_embedded.la |
| 1318 |
++ |
| 1319 |
+ bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump |
| 1320 |
+-myisamchk_DEPENDENCIES= $(LIBRARIES) |
| 1321 |
+-myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1322 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1323 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1324 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1325 |
+-myisamlog_DEPENDENCIES= $(LIBRARIES) |
| 1326 |
+-myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1327 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1328 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1329 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1330 |
+-myisampack_DEPENDENCIES=$(LIBRARIES) |
| 1331 |
+-myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1332 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1333 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1334 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1335 |
++myisamchk_DEPENDENCIES= $(LTLIBRARIES) |
| 1336 |
++myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1337 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1338 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1339 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1340 |
++myisamlog_DEPENDENCIES= $(LTLIBRARIES) |
| 1341 |
++myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1342 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1343 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1344 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1345 |
++myisampack_DEPENDENCIES=$(LTLIBRARIES) |
| 1346 |
++myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1347 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1348 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1349 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1350 |
+ noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval |
| 1351 |
+ noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \ |
| 1352 |
+ fulltext.h ftdefs.h ft_test1.h ft_eval.h \ |
| 1353 |
+ ha_myisam.h |
| 1354 |
+-mi_test1_DEPENDENCIES= $(LIBRARIES) |
| 1355 |
+-mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1356 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1357 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1358 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1359 |
+-mi_test2_DEPENDENCIES= $(LIBRARIES) |
| 1360 |
+-mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1361 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1362 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1363 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1364 |
+-mi_test3_DEPENDENCIES= $(LIBRARIES) |
| 1365 |
+-mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1366 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1367 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1368 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1369 |
+-#ft_test1_DEPENDENCIES= $(LIBRARIES) |
| 1370 |
+-#ft_eval_DEPENDENCIES= $(LIBRARIES) |
| 1371 |
+-myisam_ftdump_DEPENDENCIES= $(LIBRARIES) |
| 1372 |
+-myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1373 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1374 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1375 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1376 |
+-rt_test_DEPENDENCIES= $(LIBRARIES) |
| 1377 |
+-rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1378 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1379 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1380 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1381 |
+-sp_test_DEPENDENCIES= $(LIBRARIES) |
| 1382 |
+-sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ |
| 1383 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1384 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1385 |
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ |
| 1386 |
+-libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ |
| 1387 |
++mi_test1_DEPENDENCIES= $(LTLIBRARIES) |
| 1388 |
++mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1389 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1390 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1391 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1392 |
++mi_test2_DEPENDENCIES= $(LTLIBRARIES) |
| 1393 |
++mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1394 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1395 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1396 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1397 |
++mi_test3_DEPENDENCIES= $(LTLIBRARIES) |
| 1398 |
++mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1399 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1400 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1401 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1402 |
++#ft_test1_DEPENDENCIES= $(LTLIBRARIES) |
| 1403 |
++#ft_eval_DEPENDENCIES= $(LTLIBRARIES) |
| 1404 |
++myisam_ftdump_DEPENDENCIES= $(LTLIBRARIES) |
| 1405 |
++myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1406 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1407 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1408 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1409 |
++rt_test_DEPENDENCIES= $(LTLIBRARIES) |
| 1410 |
++rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1411 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1412 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1413 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1414 |
++sp_test_DEPENDENCIES= $(LTLIBRARIES) |
| 1415 |
++sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ |
| 1416 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1417 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1418 |
++ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ |
| 1419 |
++libmyisam_common_la_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ |
| 1420 |
+ mi_rnext.c mi_rnext_same.c \ |
| 1421 |
+ mi_search.c mi_page.c mi_key.c mi_locking.c \ |
| 1422 |
+ mi_rrnd.c mi_scan.c mi_cache.c \ |
| 1423 |
+@@ -98,8 +101,23 @@ libmyisam_a_SOURCES = mi_open.c mi_extra |
| 1424 |
+ mi_keycache.c mi_preload.c \ |
| 1425 |
+ ft_parser.c ft_stopwords.c ft_static.c \ |
| 1426 |
+ ft_update.c ft_boolean_search.c ft_nlq_search.c sort.c \ |
| 1427 |
+- ha_myisam.cc \ |
| 1428 |
+ rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c |
| 1429 |
++libmyisam_common_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1430 |
++libmyisam_s_la_SOURCES = ha_myisam.cc |
| 1431 |
++libmyisam_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1432 |
++libmyisam_s_la_LIBADD = libmyisam_common.la |
| 1433 |
++libmyisam_embedded_la_SOURCES = ha_myisam.cc |
| 1434 |
++libmyisam_embedded_la_LIBADD = libmyisam_common.la |
| 1435 |
++libmyisam_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@ |
| 1436 |
++# libmyisam references symbols inside mysqld. |
| 1437 |
++# This means we cannot use it as shared library, as these references causes |
| 1438 |
++# undefined symbol errors at load time. |
| 1439 |
++# But a static library works (as long as those parts that references |
| 1440 |
++# problematic symbols are not linked). |
| 1441 |
++libmyisam_la_LDFLAGS = -static |
| 1442 |
++libmyisam_la_SOURCES = |
| 1443 |
++libmyisam_la_LIBADD = libmyisam_s.la |
| 1444 |
++ |
| 1445 |
+ CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY? |
| 1446 |
+ |
| 1447 |
+ # Move to automake rules ? |
| 1448 |
+Index: storage/myisam/plug.in |
| 1449 |
+=================================================================== |
| 1450 |
+--- storage/myisam/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1451 |
++++ storage/myisam/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1452 |
+@@ -1,7 +1,5 @@ |
| 1453 |
+ MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine], |
| 1454 |
+ [Traditional non-transactional MySQL tables]) |
| 1455 |
+ MYSQL_PLUGIN_DIRECTORY(myisam, [storage/myisam]) |
| 1456 |
+-MYSQL_PLUGIN_STATIC(myisam, [libmyisam.a]) |
| 1457 |
++MYSQL_PLUGIN_STATIC(myisam, [libmyisam_s.la], [libmyisam_embedded.la]) |
| 1458 |
+ MYSQL_PLUGIN_MANDATORY(myisam) dnl Default |
| 1459 |
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc]) |
| 1460 |
+- |
| 1461 |
+Index: storage/myisammrg/Makefile.am |
| 1462 |
+=================================================================== |
| 1463 |
+--- storage/myisammrg/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1464 |
++++ storage/myisammrg/Makefile.am 2010-11-27 19:43:39.000000000 +0100 |
| 1465 |
+@@ -26,16 +26,28 @@ WRAPLIBS= |
| 1466 |
+ LDADD = |
| 1467 |
+ |
| 1468 |
+ DEFS = @DEFS@ |
| 1469 |
+-pkglib_LIBRARIES = libmyisammrg.a |
| 1470 |
++noinst_LTLIBRARIES = libmyisammrg.la libmyisammrg_s.la libmyisammrg_common.la \ |
| 1471 |
++ @plugin_myisammrg_embedded_static_target@ |
| 1472 |
++EXTRA_LTLIBRARIES = libmyisammrg_embedded.la |
| 1473 |
+ noinst_HEADERS = myrg_def.h ha_myisammrg.h |
| 1474 |
+-noinst_LIBRARIES = libmyisammrg.a |
| 1475 |
+-libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ |
| 1476 |
++libmyisammrg_common_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ |
| 1477 |
+ myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \ |
| 1478 |
+ myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \ |
| 1479 |
+ myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \ |
| 1480 |
+ myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \ |
| 1481 |
+- ha_myisammrg.cc \ |
| 1482 |
+ myrg_rnext_same.c myrg_records.c |
| 1483 |
++libmyisammrg_common_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@ |
| 1484 |
++libmyisammrg_s_la_SOURCES = ha_myisammrg.cc |
| 1485 |
++libmyisammrg_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@ |
| 1486 |
++libmyisammrg_s_la_LIBADD = libmyisammrg_common.la |
| 1487 |
++libmyisammrg_embedded_la_SOURCES = ha_myisammrg.cc |
| 1488 |
++libmyisammrg_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ |
| 1489 |
++libmyisammrg_embedded_la_LIBADD = libmyisammrg_common.la |
| 1490 |
++libmyisammrg_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@ |
| 1491 |
++libmyisammrg_la_SOURCES = |
| 1492 |
++libmyisammrg_la_LIBADD = libmyisammrg_s.la |
| 1493 |
++libmyisammrg_la_LDFLAGS = -static |
| 1494 |
++ |
| 1495 |
+ |
| 1496 |
+ |
| 1497 |
+ EXTRA_DIST = CMakeLists.txt plug.in |
| 1498 |
+Index: storage/myisammrg/plug.in |
| 1499 |
+=================================================================== |
| 1500 |
+--- storage/myisammrg/plug.in.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1501 |
++++ storage/myisammrg/plug.in 2010-11-27 15:02:49.000000000 +0100 |
| 1502 |
+@@ -1,6 +1,5 @@ |
| 1503 |
+ MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine], |
| 1504 |
+ [Merge multiple MySQL tables into one]) |
| 1505 |
+ MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg]) |
| 1506 |
+-MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg.a]) |
| 1507 |
++MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg_s.la], [libmyisammrg_embedded.la]) |
| 1508 |
+ MYSQL_PLUGIN_MANDATORY(myisammrg) |
| 1509 |
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc]) |
| 1510 |
+Index: storage/ndb/src/common/util/Makefile.am |
| 1511 |
+=================================================================== |
| 1512 |
+--- storage/ndb/src/common/util/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1513 |
++++ storage/ndb/src/common/util/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1514 |
+@@ -31,9 +31,9 @@ EXTRA_PROGRAMS = testBitmask |
| 1515 |
+ testBitmask_SOURCES = testBitmask.cpp |
| 1516 |
+ testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1517 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1518 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1519 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1520 |
+- $(top_builddir)/strings/libmystrings.a |
| 1521 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1522 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1523 |
++ $(top_builddir)/strings/libmystrings.la |
| 1524 |
+ |
| 1525 |
+ testBitmask.cpp : Bitmask.cpp |
| 1526 |
+ rm -f testBitmask.cpp |
| 1527 |
+Index: storage/ndb/config/type_ndbapitest.mk.am |
| 1528 |
+=================================================================== |
| 1529 |
+--- storage/ndb/config/type_ndbapitest.mk.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1530 |
++++ storage/ndb/config/type_ndbapitest.mk.am 2010-11-27 15:02:49.000000000 +0100 |
| 1531 |
+@@ -13,19 +13,20 @@ |
| 1532 |
+ # along with this program; if not, write to the Free Software |
| 1533 |
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 1534 |
+ |
| 1535 |
+-LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \ |
| 1536 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1537 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1538 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1539 |
+- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ |
| 1540 |
++LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \ |
| 1541 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1542 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1543 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1544 |
++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \ |
| 1545 |
++ $(ZLIB_LIBS) |
| 1546 |
+ |
| 1547 |
+-INCLUDES += -I$(top_srcdir) \ |
| 1548 |
+- -I$(top_builddir)/include \ |
| 1549 |
+- -I$(top_builddir)/storage/ndb/include \ |
| 1550 |
+- -I$(top_srcdir)/include \ |
| 1551 |
+- -I$(top_srcdir)/storage/ndb/include \ |
| 1552 |
+- -I$(top_srcdir)/storage/ndb/include/ndbapi \ |
| 1553 |
+- -I$(top_srcdir)/storage/ndb/include/util \ |
| 1554 |
+- -I$(top_srcdir)/storage/ndb/include/portlib \ |
| 1555 |
+- -I$(top_srcdir)/storage/ndb/test/include \ |
| 1556 |
+- -I$(top_srcdir)/storage/ndb/include/mgmapi |
| 1557 |
++INCLUDES += -I$(top_srcdir) \ |
| 1558 |
++ -I$(top_builddir)/include \ |
| 1559 |
++ -I$(top_builddir)/storage/ndb/include \ |
| 1560 |
++ -I$(top_srcdir)/include \ |
| 1561 |
++ -I$(top_srcdir)/storage/ndb/include \ |
| 1562 |
++ -I$(top_srcdir)/storage/ndb/include/ndbapi \ |
| 1563 |
++ -I$(top_srcdir)/storage/ndb/include/util \ |
| 1564 |
++ -I$(top_srcdir)/storage/ndb/include/portlib \ |
| 1565 |
++ -I$(top_srcdir)/storage/ndb/test/include \ |
| 1566 |
++ -I$(top_srcdir)/storage/ndb/include/mgmapi |
| 1567 |
+Index: storage/ndb/config/type_ndbapitools.mk.am |
| 1568 |
+=================================================================== |
| 1569 |
+--- storage/ndb/config/type_ndbapitools.mk.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1570 |
++++ storage/ndb/config/type_ndbapitools.mk.am 2010-11-27 15:02:49.000000000 +0100 |
| 1571 |
+@@ -13,20 +13,21 @@ |
| 1572 |
+ # along with this program; if not, write to the Free Software |
| 1573 |
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 1574 |
+ |
| 1575 |
+-LDADD += \ |
| 1576 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1577 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1578 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1579 |
+- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@ |
| 1580 |
++LDADD += \ |
| 1581 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1582 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1583 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1584 |
++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \ |
| 1585 |
++ $(ZLIB_LIBS) |
| 1586 |
+ |
| 1587 |
+-INCLUDES += -I$(srcdir) \ |
| 1588 |
+- -I$(top_builddir)/include \ |
| 1589 |
+- -I$(top_builddir)/storage/ndb/include \ |
| 1590 |
+- -I$(top_srcdir)/include \ |
| 1591 |
+- -I$(top_srcdir)/storage/ndb/include \ |
| 1592 |
+- -I$(top_srcdir)/storage/ndb/include/ndbapi \ |
| 1593 |
+- -I$(top_srcdir)/storage/ndb/include/util \ |
| 1594 |
+- -I$(top_srcdir)/storage/ndb/include/portlib \ |
| 1595 |
+- -I$(top_srcdir)/storage/ndb/test/include \ |
| 1596 |
+- -I$(top_srcdir)/storage/ndb/include/mgmapi \ |
| 1597 |
+- -I$(top_srcdir)/storage/ndb/include/kernel |
| 1598 |
++INCLUDES += -I$(srcdir) \ |
| 1599 |
++ -I$(top_builddir)/include \ |
| 1600 |
++ -I$(top_builddir)/storage/ndb/include \ |
| 1601 |
++ -I$(top_srcdir)/include \ |
| 1602 |
++ -I$(top_srcdir)/storage/ndb/include \ |
| 1603 |
++ -I$(top_srcdir)/storage/ndb/include/ndbapi \ |
| 1604 |
++ -I$(top_srcdir)/storage/ndb/include/util \ |
| 1605 |
++ -I$(top_srcdir)/storage/ndb/include/portlib \ |
| 1606 |
++ -I$(top_srcdir)/storage/ndb/test/include \ |
| 1607 |
++ -I$(top_srcdir)/storage/ndb/include/mgmapi \ |
| 1608 |
++ -I$(top_srcdir)/storage/ndb/include/kernel |
| 1609 |
+Index: storage/ndb/config/win-libraries |
| 1610 |
+=================================================================== |
| 1611 |
+--- storage/ndb/config/win-libraries.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1612 |
++++ storage/ndb/config/win-libraries 2010-11-27 15:02:49.000000000 +0100 |
| 1613 |
+@@ -21,7 +21,7 @@ do |
| 1614 |
+ # the same goes for mysys and strings |
| 1615 |
+ lib=$i |
| 1616 |
+ case $i in |
| 1617 |
+- *libdbug.a | *libmysys.a | *libmystrings.a) |
| 1618 |
++ *libdbug.la | *libmysys.la | *libmystrings.la) |
| 1619 |
+ lib=`echo $i | sed s'!dbug\/lib!!' | sed 's!mysys\/lib!!' | sed 's!strings\/libmy!!'` |
| 1620 |
+ echo "Changing from $i to $lib" |
| 1621 |
+ ;; |
| 1622 |
+Index: storage/ndb/src/cw/cpcd/Makefile.am |
| 1623 |
+=================================================================== |
| 1624 |
+--- storage/ndb/src/cw/cpcd/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1625 |
++++ storage/ndb/src/cw/cpcd/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1626 |
+@@ -19,9 +19,9 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro |
| 1627 |
+ |
| 1628 |
+ LDADD_LOC = \ |
| 1629 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1630 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1631 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1632 |
+- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ |
| 1633 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1634 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1635 |
++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ |
| 1636 |
+ |
| 1637 |
+ include $(top_srcdir)/storage/ndb/config/common.mk.am |
| 1638 |
+ include $(top_srcdir)/storage/ndb/config/type_util.mk.am |
| 1639 |
+Index: storage/ndb/src/kernel/Makefile.am |
| 1640 |
+=================================================================== |
| 1641 |
+--- storage/ndb/src/kernel/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1642 |
++++ storage/ndb/src/kernel/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1643 |
+@@ -53,9 +53,10 @@ LDADD += \ |
| 1644 |
+ $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \ |
| 1645 |
+ $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ |
| 1646 |
+ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ |
| 1647 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1648 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1649 |
+- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ |
| 1650 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1651 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1652 |
++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \ |
| 1653 |
++ $(ZLIB_LIBS) |
| 1654 |
+ |
| 1655 |
+ windoze-dsp: ndbd.dsp |
| 1656 |
+ |
| 1657 |
+Index: storage/ndb/src/kernel/blocks/Makefile.am |
| 1658 |
+=================================================================== |
| 1659 |
+--- storage/ndb/src/kernel/blocks/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1660 |
++++ storage/ndb/src/kernel/blocks/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1661 |
+@@ -18,7 +18,7 @@ SUBDIRS = \ |
| 1662 |
+ dbdih \ |
| 1663 |
+ dblqh \ |
| 1664 |
+ dbtup \ |
| 1665 |
+- backup |
| 1666 |
++ backup |
| 1667 |
+ |
| 1668 |
+ noinst_LIBRARIES = libblocks.a |
| 1669 |
+ |
| 1670 |
+@@ -56,10 +56,10 @@ libblocks_a_SOURCES = tsman.cpp lgman.cp |
| 1671 |
+ EXTRA_PROGRAMS = ndb_print_file |
| 1672 |
+ ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp |
| 1673 |
+ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1674 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1675 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1676 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1677 |
+- $(top_builddir)/strings/libmystrings.a |
| 1678 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1679 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1680 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1681 |
++ $(top_builddir)/strings/libmystrings.la |
| 1682 |
+ |
| 1683 |
+ include $(top_srcdir)/storage/ndb/config/common.mk.am |
| 1684 |
+ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am |
| 1685 |
+Index: storage/ndb/src/kernel/blocks/backup/Makefile.am |
| 1686 |
+=================================================================== |
| 1687 |
+--- storage/ndb/src/kernel/blocks/backup/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1688 |
++++ storage/ndb/src/kernel/blocks/backup/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1689 |
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_backup_fil |
| 1690 |
+ ndb_print_backup_file_SOURCES = read.cpp |
| 1691 |
+ ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1692 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1693 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1694 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1695 |
+- $(top_builddir)/strings/libmystrings.a |
| 1696 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1697 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1698 |
++ $(top_builddir)/strings/libmystrings.la |
| 1699 |
+ |
| 1700 |
+ include $(top_srcdir)/storage/ndb/config/common.mk.am |
| 1701 |
+ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am |
| 1702 |
+Index: storage/ndb/src/kernel/blocks/dbdict/Makefile.am |
| 1703 |
+=================================================================== |
| 1704 |
+--- storage/ndb/src/kernel/blocks/dbdict/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1705 |
++++ storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1706 |
+@@ -19,17 +19,17 @@ include $(top_srcdir)/storage/ndb/config |
| 1707 |
+ LDADD += \ |
| 1708 |
+ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ |
| 1709 |
+ $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ |
| 1710 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1711 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1712 |
+- $(top_builddir)/strings/libmystrings.a |
| 1713 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1714 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1715 |
++ $(top_builddir)/strings/libmystrings.la |
| 1716 |
+ |
| 1717 |
+ ndbtools_PROGRAMS = ndb_print_schema_file |
| 1718 |
+ ndb_print_schema_file_SOURCES = printSchemaFile.cpp |
| 1719 |
+ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1720 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1721 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1722 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1723 |
+- $(top_builddir)/strings/libmystrings.a |
| 1724 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1725 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1726 |
++ $(top_builddir)/strings/libmystrings.la |
| 1727 |
+ |
| 1728 |
+ # Don't update the files from bitkeeper |
| 1729 |
+ %::SCCS/s.% |
| 1730 |
+Index: storage/ndb/src/kernel/blocks/dbdih/Makefile.am |
| 1731 |
+=================================================================== |
| 1732 |
+--- storage/ndb/src/kernel/blocks/dbdih/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1733 |
++++ storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1734 |
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_sys_file |
| 1735 |
+ ndb_print_sys_file_SOURCES = printSysfile.cpp |
| 1736 |
+ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1737 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1738 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1739 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1740 |
+- $(top_builddir)/strings/libmystrings.a |
| 1741 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1742 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1743 |
++ $(top_builddir)/strings/libmystrings.la |
| 1744 |
+ |
| 1745 |
+ |
| 1746 |
+ include $(top_srcdir)/storage/ndb/config/common.mk.am |
| 1747 |
+Index: storage/ndb/src/kernel/blocks/dblqh/Makefile.am |
| 1748 |
+=================================================================== |
| 1749 |
+--- storage/ndb/src/kernel/blocks/dblqh/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1750 |
++++ storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1751 |
+@@ -23,9 +23,9 @@ include $(top_srcdir)/storage/ndb/config |
| 1752 |
+ |
| 1753 |
+ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1754 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1755 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1756 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1757 |
+- $(top_builddir)/strings/libmystrings.a |
| 1758 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1759 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1760 |
++ $(top_builddir)/strings/libmystrings.la |
| 1761 |
+ |
| 1762 |
+ # Don't update the files from bitkeeper |
| 1763 |
+ %::SCCS/s.% |
| 1764 |
+Index: storage/ndb/src/kernel/blocks/dbtup/Makefile.am |
| 1765 |
+=================================================================== |
| 1766 |
+--- storage/ndb/src/kernel/blocks/dbtup/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1767 |
++++ storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1768 |
+@@ -20,9 +20,9 @@ EXTRA_PROGRAMS = test_varpage |
| 1769 |
+ test_varpage_SOURCES = test_varpage.cpp tuppage.cpp |
| 1770 |
+ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1771 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1772 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1773 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1774 |
+- $(top_builddir)/strings/libmystrings.a |
| 1775 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1776 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1777 |
++ $(top_builddir)/strings/libmystrings.la |
| 1778 |
+ |
| 1779 |
+ # Don't update the files from bitkeeper |
| 1780 |
+ %::SCCS/s.% |
| 1781 |
+Index: storage/ndb/src/kernel/vm/Makefile.am |
| 1782 |
+=================================================================== |
| 1783 |
+--- storage/ndb/src/kernel/vm/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1784 |
++++ storage/ndb/src/kernel/vm/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1785 |
+@@ -21,22 +21,22 @@ |
| 1786 |
+ noinst_LIBRARIES = libkernel.a |
| 1787 |
+ |
| 1788 |
+ libkernel_a_SOURCES = \ |
| 1789 |
+- SimulatedBlock.cpp \ |
| 1790 |
+- FastScheduler.cpp \ |
| 1791 |
+- TimeQueue.cpp \ |
| 1792 |
+- VMSignal.cpp \ |
| 1793 |
+- ThreadConfig.cpp \ |
| 1794 |
+- TransporterCallback.cpp \ |
| 1795 |
+- Emulator.cpp \ |
| 1796 |
+- Configuration.cpp \ |
| 1797 |
+- WatchDog.cpp \ |
| 1798 |
+- SimplePropertiesSection.cpp \ |
| 1799 |
+- SectionReader.cpp \ |
| 1800 |
+- Mutex.cpp SafeCounter.cpp \ |
| 1801 |
+- Rope.cpp \ |
| 1802 |
+- ndbd_malloc.cpp ndbd_malloc_impl.cpp \ |
| 1803 |
+- Pool.cpp WOPool.cpp RWPool.cpp \ |
| 1804 |
+- DynArr256.cpp |
| 1805 |
++ SimulatedBlock.cpp \ |
| 1806 |
++ FastScheduler.cpp \ |
| 1807 |
++ TimeQueue.cpp \ |
| 1808 |
++ VMSignal.cpp \ |
| 1809 |
++ ThreadConfig.cpp \ |
| 1810 |
++ TransporterCallback.cpp \ |
| 1811 |
++ Emulator.cpp \ |
| 1812 |
++ Configuration.cpp \ |
| 1813 |
++ WatchDog.cpp \ |
| 1814 |
++ SimplePropertiesSection.cpp \ |
| 1815 |
++ SectionReader.cpp \ |
| 1816 |
++ Mutex.cpp SafeCounter.cpp \ |
| 1817 |
++ Rope.cpp \ |
| 1818 |
++ ndbd_malloc.cpp ndbd_malloc_impl.cpp \ |
| 1819 |
++ Pool.cpp WOPool.cpp RWPool.cpp \ |
| 1820 |
++ DynArr256.cpp |
| 1821 |
+ |
| 1822 |
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi |
| 1823 |
+ |
| 1824 |
+@@ -49,40 +49,40 @@ include $(top_srcdir)/storage/ndb/config |
| 1825 |
+ windoze-dsp: libkernel.dsp |
| 1826 |
+ |
| 1827 |
+ libkernel.dsp: Makefile \ |
| 1828 |
+- $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 1829 |
+- $(top_srcdir)/storage/ndb/config/win-name \ |
| 1830 |
+- $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1831 |
+- $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1832 |
+- $(top_srcdir)/storage/ndb/config/win-libraries |
| 1833 |
+- cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 1834 |
+- @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES) |
| 1835 |
+- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1836 |
+- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES) |
| 1837 |
+- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) |
| 1838 |
++ $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 1839 |
++ $(top_srcdir)/storage/ndb/config/win-name \ |
| 1840 |
++ $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1841 |
++ $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1842 |
++ $(top_srcdir)/storage/ndb/config/win-libraries |
| 1843 |
++ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 1844 |
++ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES) |
| 1845 |
++ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1846 |
++ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES) |
| 1847 |
++ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) |
| 1848 |
+ |
| 1849 |
+ EXTRA_PROGRAMS = ndbd_malloc_impl_test bench_pool testDynArr256 |
| 1850 |
+ ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_TEST |
| 1851 |
+ ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp |
| 1852 |
+ ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1853 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1854 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1855 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1856 |
+- $(top_builddir)/strings/libmystrings.a |
| 1857 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1858 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1859 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1860 |
++ $(top_builddir)/strings/libmystrings.la |
| 1861 |
+ |
| 1862 |
+ bench_pool_SOURCES = bench_pool.cpp |
| 1863 |
+-bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\ |
| 1864 |
+- libkernel.a ../error/liberror.a \ |
| 1865 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1866 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1867 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1868 |
+- $(top_builddir)/strings/libmystrings.a |
| 1869 |
++bench_pool_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1870 |
++ libkernel.a ../error/liberror.a \ |
| 1871 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1872 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1873 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1874 |
++ $(top_builddir)/strings/libmystrings.la |
| 1875 |
+ |
| 1876 |
+ testDynArr256_CXXFLAGS = -DUNIT_TEST |
| 1877 |
+ testDynArr256_SOURCES = DynArr256.cpp |
| 1878 |
+ testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \ |
| 1879 |
+- libkernel.a ../error/liberror.a \ |
| 1880 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1881 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1882 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1883 |
+- $(top_builddir)/strings/libmystrings.a |
| 1884 |
++ libkernel.a ../error/liberror.a \ |
| 1885 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1886 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1887 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1888 |
++ $(top_builddir)/strings/libmystrings.la |
| 1889 |
+ |
| 1890 |
+Index: storage/ndb/src/mgmclient/Makefile.am |
| 1891 |
+=================================================================== |
| 1892 |
+--- storage/ndb/src/mgmclient/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1893 |
++++ storage/ndb/src/mgmclient/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1894 |
+@@ -18,12 +18,11 @@ ndbtools_PROGRAMS = ndb_mgm |
| 1895 |
+ |
| 1896 |
+ libndbmgmclient_la_SOURCES = CommandInterpreter.cpp |
| 1897 |
+ libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \ |
| 1898 |
+- ../common/logger/liblogger.la \ |
| 1899 |
+- ../common/portlib/libportlib.la \ |
| 1900 |
+- ../common/util/libgeneral.la \ |
| 1901 |
+- ../common/portlib/libportlib.la \ |
| 1902 |
+- ../common/debugger/libtrace.la |
| 1903 |
+- |
| 1904 |
++ ../common/logger/liblogger.la \ |
| 1905 |
++ ../common/portlib/libportlib.la \ |
| 1906 |
++ ../common/util/libgeneral.la \ |
| 1907 |
++ ../common/portlib/libportlib.la \ |
| 1908 |
++ ../common/debugger/libtrace.la |
| 1909 |
+ |
| 1910 |
+ ndb_mgm_SOURCES = main.cpp |
| 1911 |
+ |
| 1912 |
+@@ -34,13 +33,13 @@ INCLUDES += -I$(top_srcdir)/storage/ndb/ |
| 1913 |
+ -I$(top_srcdir)/storage/ndb/src/common/mgmcommon |
| 1914 |
+ |
| 1915 |
+ LDADD_LOC = $(noinst_LTLIBRARIES) \ |
| 1916 |
+- ../common/portlib/libportlib.la \ |
| 1917 |
+- @readline_link@ \ |
| 1918 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1919 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 1920 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 1921 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 1922 |
+- @TERMCAP_LIB@ @NDB_SCI_LIBS@ |
| 1923 |
++ ../common/portlib/libportlib.la \ |
| 1924 |
++ @readline_link@ \ |
| 1925 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 1926 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 1927 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 1928 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 1929 |
++ @TERMCAP_LIB@ @NDB_SCI_LIBS@ |
| 1930 |
+ |
| 1931 |
+ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ |
| 1932 |
+ |
| 1933 |
+@@ -50,25 +49,25 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ |
| 1934 |
+ windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp |
| 1935 |
+ |
| 1936 |
+ ndb_mgm.dsp: Makefile \ |
| 1937 |
+- $(top_srcdir)/storage/ndb/config/win-prg.am \ |
| 1938 |
+- $(top_srcdir)/storage/ndb/config/win-name \ |
| 1939 |
+- $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1940 |
+- $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1941 |
+- $(top_srcdir)/storage/ndb/config/win-libraries |
| 1942 |
+- cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ |
| 1943 |
+- @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS) |
| 1944 |
+- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1945 |
+- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES) |
| 1946 |
+- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) |
| 1947 |
++ $(top_srcdir)/storage/ndb/config/win-prg.am \ |
| 1948 |
++ $(top_srcdir)/storage/ndb/config/win-name \ |
| 1949 |
++ $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1950 |
++ $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1951 |
++ $(top_srcdir)/storage/ndb/config/win-libraries |
| 1952 |
++ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ |
| 1953 |
++ @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS) |
| 1954 |
++ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1955 |
++ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES) |
| 1956 |
++ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) |
| 1957 |
+ |
| 1958 |
+ libndbmgmclient.dsp: Makefile \ |
| 1959 |
+- $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 1960 |
+- $(top_srcdir)/storage/ndb/config/win-name \ |
| 1961 |
+- $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1962 |
+- $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1963 |
+- $(top_srcdir)/storage/ndb/config/win-libraries |
| 1964 |
+- cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 1965 |
+- @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) |
| 1966 |
+- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1967 |
+- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES) |
| 1968 |
+- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB |
| 1969 |
++ $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 1970 |
++ $(top_srcdir)/storage/ndb/config/win-name \ |
| 1971 |
++ $(top_srcdir)/storage/ndb/config/win-includes \ |
| 1972 |
++ $(top_srcdir)/storage/ndb/config/win-sources \ |
| 1973 |
++ $(top_srcdir)/storage/ndb/config/win-libraries |
| 1974 |
++ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 1975 |
++ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) |
| 1976 |
++ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 1977 |
++ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES) |
| 1978 |
++ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB |
| 1979 |
+Index: storage/ndb/src/mgmsrv/Makefile.am |
| 1980 |
+=================================================================== |
| 1981 |
+--- storage/ndb/src/mgmsrv/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 1982 |
++++ storage/ndb/src/mgmsrv/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 1983 |
+@@ -22,35 +22,35 @@ MYSQLCLUSTERdir= . |
| 1984 |
+ ndbbin_PROGRAMS = ndb_mgmd |
| 1985 |
+ |
| 1986 |
+ ndb_mgmd_SOURCES = \ |
| 1987 |
+- MgmtSrvr.cpp \ |
| 1988 |
+- MgmtSrvrGeneralSignalHandling.cpp \ |
| 1989 |
+- main.cpp \ |
| 1990 |
+- Services.cpp \ |
| 1991 |
+- convertStrToInt.cpp \ |
| 1992 |
+- SignalQueue.cpp \ |
| 1993 |
+- MgmtSrvrConfig.cpp \ |
| 1994 |
+- ConfigInfo.cpp \ |
| 1995 |
+- InitConfigFileParser.cpp \ |
| 1996 |
+- Config.cpp |
| 1997 |
++ MgmtSrvr.cpp \ |
| 1998 |
++ MgmtSrvrGeneralSignalHandling.cpp \ |
| 1999 |
++ main.cpp \ |
| 2000 |
++ Services.cpp \ |
| 2001 |
++ convertStrToInt.cpp \ |
| 2002 |
++ SignalQueue.cpp \ |
| 2003 |
++ MgmtSrvrConfig.cpp \ |
| 2004 |
++ ConfigInfo.cpp \ |
| 2005 |
++ InitConfigFileParser.cpp \ |
| 2006 |
++ Config.cpp |
| 2007 |
+ |
| 2008 |
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \ |
| 2009 |
+- -I$(top_srcdir)/storage/ndb/src/mgmapi \ |
| 2010 |
+- -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \ |
| 2011 |
+- -I$(top_srcdir)/storage/ndb/src/mgmclient |
| 2012 |
++ -I$(top_srcdir)/storage/ndb/src/mgmapi \ |
| 2013 |
++ -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \ |
| 2014 |
++ -I$(top_srcdir)/storage/ndb/src/mgmclient |
| 2015 |
+ |
| 2016 |
+ LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \ |
| 2017 |
+- $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 2018 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 2019 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 2020 |
+- $(top_builddir)/strings/libmystrings.a \ |
| 2021 |
+- @readline_link@ \ |
| 2022 |
+- @NDB_SCI_LIBS@ \ |
| 2023 |
+- @TERMCAP_LIB@ |
| 2024 |
+- |
| 2025 |
+-DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ |
| 2026 |
+- -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ |
| 2027 |
+- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ |
| 2028 |
+- -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\"" |
| 2029 |
++ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 2030 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 2031 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 2032 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 2033 |
++ @readline_link@ \ |
| 2034 |
++ @NDB_SCI_LIBS@ \ |
| 2035 |
++ @TERMCAP_LIB@ |
| 2036 |
++ |
| 2037 |
++DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ |
| 2038 |
++ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ |
| 2039 |
++ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ |
| 2040 |
++ -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\"" |
| 2041 |
+ |
| 2042 |
+ include $(top_srcdir)/storage/ndb/config/common.mk.am |
| 2043 |
+ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am |
| 2044 |
+@@ -63,13 +63,13 @@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@ |
| 2045 |
+ windoze-dsp: ndb_mgmd.dsp |
| 2046 |
+ |
| 2047 |
+ ndb_mgmd.dsp: Makefile \ |
| 2048 |
+- $(top_srcdir)/storage/ndb/config/win-prg.am \ |
| 2049 |
+- $(top_srcdir)/storage/ndb/config/win-name \ |
| 2050 |
+- $(top_srcdir)/storage/ndb/config/win-includes \ |
| 2051 |
+- $(top_srcdir)/storage/ndb/config/win-sources \ |
| 2052 |
+- $(top_srcdir)/storage/ndb/config/win-libraries |
| 2053 |
+- cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ |
| 2054 |
+- @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS) |
| 2055 |
+- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 2056 |
+- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES) |
| 2057 |
+- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) |
| 2058 |
++ $(top_srcdir)/storage/ndb/config/win-prg.am \ |
| 2059 |
++ $(top_srcdir)/storage/ndb/config/win-name \ |
| 2060 |
++ $(top_srcdir)/storage/ndb/config/win-includes \ |
| 2061 |
++ $(top_srcdir)/storage/ndb/config/win-sources \ |
| 2062 |
++ $(top_srcdir)/storage/ndb/config/win-libraries |
| 2063 |
++ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ |
| 2064 |
++ @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS) |
| 2065 |
++ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 2066 |
++ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES) |
| 2067 |
++ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) |
| 2068 |
+Index: storage/ndb/src/ndbapi/Makefile.am |
| 2069 |
+=================================================================== |
| 2070 |
+--- storage/ndb/src/ndbapi/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2071 |
++++ storage/ndb/src/ndbapi/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 2072 |
+@@ -22,41 +22,42 @@ ndberror_check_SOURCES = ndberror_check. |
| 2073 |
+ noinst_LTLIBRARIES = libndbapi.la |
| 2074 |
+ |
| 2075 |
+ libndbapi_la_SOURCES = \ |
| 2076 |
+- TransporterFacade.cpp \ |
| 2077 |
+- ClusterMgr.cpp \ |
| 2078 |
+- Ndb.cpp \ |
| 2079 |
+- NdbPoolImpl.cpp \ |
| 2080 |
+- NdbPool.cpp \ |
| 2081 |
+- Ndblist.cpp \ |
| 2082 |
+- Ndbif.cpp \ |
| 2083 |
+- Ndbinit.cpp \ |
| 2084 |
+- Ndberr.cpp \ |
| 2085 |
+- ndberror.c \ |
| 2086 |
+- NdbErrorOut.cpp \ |
| 2087 |
+- NdbTransaction.cpp \ |
| 2088 |
+- NdbTransactionScan.cpp \ |
| 2089 |
+- NdbOperation.cpp \ |
| 2090 |
+- NdbOperationSearch.cpp \ |
| 2091 |
+- NdbOperationScan.cpp \ |
| 2092 |
+- NdbOperationInt.cpp \ |
| 2093 |
+- NdbOperationDefine.cpp \ |
| 2094 |
+- NdbOperationExec.cpp \ |
| 2095 |
+- NdbScanOperation.cpp NdbScanFilter.cpp \ |
| 2096 |
+- NdbIndexOperation.cpp \ |
| 2097 |
+- NdbEventOperation.cpp \ |
| 2098 |
+- NdbEventOperationImpl.cpp \ |
| 2099 |
+- NdbApiSignal.cpp \ |
| 2100 |
+- NdbRecAttr.cpp \ |
| 2101 |
+- NdbUtil.cpp \ |
| 2102 |
+- NdbReceiver.cpp \ |
| 2103 |
+- NdbDictionary.cpp \ |
| 2104 |
+- NdbDictionaryImpl.cpp \ |
| 2105 |
+- DictCache.cpp \ |
| 2106 |
+- ndb_cluster_connection.cpp \ |
| 2107 |
+- NdbBlob.cpp \ |
| 2108 |
+- NdbIndexStat.cpp \ |
| 2109 |
+- SignalSender.cpp \ |
| 2110 |
+- ObjectMap.cpp |
| 2111 |
++ TransporterFacade.cpp \ |
| 2112 |
++ ClusterMgr.cpp \ |
| 2113 |
++ Ndb.cpp \ |
| 2114 |
++ NdbPoolImpl.cpp \ |
| 2115 |
++ NdbPool.cpp \ |
| 2116 |
++ Ndblist.cpp \ |
| 2117 |
++ Ndbif.cpp \ |
| 2118 |
++ Ndbinit.cpp \ |
| 2119 |
++ Ndberr.cpp \ |
| 2120 |
++ ndberror.c \ |
| 2121 |
++ NdbErrorOut.cpp \ |
| 2122 |
++ NdbTransaction.cpp \ |
| 2123 |
++ NdbTransactionScan.cpp \ |
| 2124 |
++ NdbOperation.cpp \ |
| 2125 |
++ NdbOperationSearch.cpp \ |
| 2126 |
++ NdbOperationScan.cpp \ |
| 2127 |
++ NdbOperationInt.cpp \ |
| 2128 |
++ NdbOperationDefine.cpp \ |
| 2129 |
++ NdbOperationExec.cpp \ |
| 2130 |
++ NdbScanOperation.cpp \ |
| 2131 |
++ NdbScanFilter.cpp \ |
| 2132 |
++ NdbIndexOperation.cpp \ |
| 2133 |
++ NdbEventOperation.cpp \ |
| 2134 |
++ NdbEventOperationImpl.cpp \ |
| 2135 |
++ NdbApiSignal.cpp \ |
| 2136 |
++ NdbRecAttr.cpp \ |
| 2137 |
++ NdbUtil.cpp \ |
| 2138 |
++ NdbReceiver.cpp \ |
| 2139 |
++ NdbDictionary.cpp \ |
| 2140 |
++ NdbDictionaryImpl.cpp \ |
| 2141 |
++ DictCache.cpp \ |
| 2142 |
++ ndb_cluster_connection.cpp \ |
| 2143 |
++ NdbBlob.cpp \ |
| 2144 |
++ NdbIndexStat.cpp \ |
| 2145 |
++ SignalSender.cpp \ |
| 2146 |
++ ObjectMap.cpp |
| 2147 |
+ |
| 2148 |
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi |
| 2149 |
+ |
| 2150 |
+@@ -67,9 +68,10 @@ include $(top_srcdir)/storage/ndb/config |
| 2151 |
+ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am |
| 2152 |
+ |
| 2153 |
+ ndberror_check_LDFLAGS = \ |
| 2154 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 2155 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 2156 |
+- $(top_builddir)/strings/libmystrings.a |
| 2157 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 2158 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 2159 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 2160 |
++ $(ZLIB_LIBS) |
| 2161 |
+ |
| 2162 |
+ # Don't update the files from bitkeeper |
| 2163 |
+ %::SCCS/s.% |
| 2164 |
+@@ -77,13 +79,13 @@ ndberror_check_LDFLAGS = \ |
| 2165 |
+ windoze-dsp: libndbapi.dsp |
| 2166 |
+ |
| 2167 |
+ libndbapi.dsp: Makefile \ |
| 2168 |
+- $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 2169 |
+- $(top_srcdir)/storage/ndb/config/win-name \ |
| 2170 |
+- $(top_srcdir)/storage/ndb/config/win-includes \ |
| 2171 |
+- $(top_srcdir)/storage/ndb/config/win-sources \ |
| 2172 |
+- $(top_srcdir)/storage/ndb/config/win-libraries |
| 2173 |
+- cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 2174 |
+- @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) |
| 2175 |
+- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 2176 |
+- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES) |
| 2177 |
+- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) |
| 2178 |
++ $(top_srcdir)/storage/ndb/config/win-lib.am \ |
| 2179 |
++ $(top_srcdir)/storage/ndb/config/win-name \ |
| 2180 |
++ $(top_srcdir)/storage/ndb/config/win-includes \ |
| 2181 |
++ $(top_srcdir)/storage/ndb/config/win-sources \ |
| 2182 |
++ $(top_srcdir)/storage/ndb/config/win-libraries |
| 2183 |
++ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ |
| 2184 |
++ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) |
| 2185 |
++ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) |
| 2186 |
++ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES) |
| 2187 |
++ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) |
| 2188 |
+Index: storage/ndb/test/run-test/Makefile.am |
| 2189 |
+=================================================================== |
| 2190 |
+--- storage/ndb/test/run-test/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2191 |
++++ storage/ndb/test/run-test/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 2192 |
+@@ -34,9 +34,9 @@ atrt_SOURCES = main.cpp setup.cpp files. |
| 2193 |
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include |
| 2194 |
+ LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \ |
| 2195 |
+ $(top_builddir)/storage/ndb/src/libndbclient.la \ |
| 2196 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 2197 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 2198 |
+- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ |
| 2199 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 2200 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 2201 |
++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ |
| 2202 |
+ |
| 2203 |
+ atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \ |
| 2204 |
+ -I$(top_srcdir)/ndb/src/mgmsrv \ |
| 2205 |
+Index: strings/Makefile.am |
| 2206 |
+=================================================================== |
| 2207 |
+--- strings/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2208 |
++++ strings/Makefile.am 2010-11-27 19:42:38.000000000 +0100 |
| 2209 |
+@@ -16,7 +16,7 @@ |
| 2210 |
+ # This file is public domain and comes with NO WARRANTY of any kind |
| 2211 |
+ |
| 2212 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include |
| 2213 |
+-pkglib_LIBRARIES = libmystrings.a |
| 2214 |
++noinst_LTLIBRARIES = libmystrings.la |
| 2215 |
+ |
| 2216 |
+ # Exact one of ASSEMBLER_X |
| 2217 |
+ if ASSEMBLER_x86 |
| 2218 |
+@@ -37,7 +37,7 @@ CSRCS = strxmov.c bmove_upp.c strappend |
| 2219 |
+ endif |
| 2220 |
+ endif |
| 2221 |
+ |
| 2222 |
+-libmystrings_a_SOURCES = $(ASRCS) $(CSRCS) |
| 2223 |
++libmystrings_la_SOURCES = $(ASRCS) $(CSRCS) |
| 2224 |
+ noinst_PROGRAMS = conf_to_src |
| 2225 |
+ CLEANFILES = str_test uctypedump test_decimal |
| 2226 |
+ # Default charset definitions |
| 2227 |
+@@ -56,9 +56,9 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c |
| 2228 |
+ t_ctype.h my_strchr.c CMakeLists.txt \ |
| 2229 |
+ CHARSET_INFO.txt |
| 2230 |
+ |
| 2231 |
+-libmystrings_a_LIBADD= |
| 2232 |
+-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c |
| 2233 |
+-conf_to_src_LDADD= |
| 2234 |
++libmystrings_la_LIBADD= |
| 2235 |
++conf_to_src_SOURCES = conf_to_src.c |
| 2236 |
++conf_to_src_LDADD = libmystrings.la |
| 2237 |
+ #force static linking of conf_to_src - essential when linking against |
| 2238 |
+ #custom installation of libc |
| 2239 |
+ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ |
| 2240 |
+@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ |
| 2241 |
+ |
| 2242 |
+ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ |
| 2243 |
+ |
| 2244 |
+-str_test: str_test.c $(pkglib_LIBRARIES) |
| 2245 |
+- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) |
| 2246 |
++str_test: str_test.c $(pkglib_LTLIBRARIES) |
| 2247 |
++ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES) |
| 2248 |
+ |
| 2249 |
+ uctypedump: uctypedump.c |
| 2250 |
+ $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c |
| 2251 |
+ |
| 2252 |
+ test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) |
| 2253 |
+ $(CP) $(srcdir)/decimal.c ./test_decimal.c |
| 2254 |
+- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) |
| 2255 |
++ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES) |
| 2256 |
+ $(RM) -f ./test_decimal.c |
| 2257 |
+ |
| 2258 |
+ # Don't update the files from bitkeeper |
| 2259 |
+Index: unittest/unit.pl |
| 2260 |
+=================================================================== |
| 2261 |
+--- unittest/unit.pl.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2262 |
++++ unittest/unit.pl 2010-11-27 15:02:49.000000000 +0100 |
| 2263 |
+@@ -55,7 +55,7 @@ sub _find_test_files (@) { |
| 2264 |
+ my @dirs = @_; |
| 2265 |
+ my @files; |
| 2266 |
+ find sub { |
| 2267 |
+- $File::Find::prune = 1 if /^SCCS$/; |
| 2268 |
++ $File::Find::prune = 1 if /^(SCCS|\.libs)$/; |
| 2269 |
+ push(@files, $File::Find::name) if -x _ && /-t\z/; |
| 2270 |
+ }, @dirs; |
| 2271 |
+ return @files; |
| 2272 |
+Index: unittest/mysys/Makefile.am |
| 2273 |
+=================================================================== |
| 2274 |
+--- unittest/mysys/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2275 |
++++ unittest/mysys/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 2276 |
+@@ -13,15 +13,16 @@ |
| 2277 |
+ # along with this program; if not, write to the Free Software |
| 2278 |
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 2279 |
+ |
| 2280 |
+-AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include |
| 2281 |
+-AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap |
| 2282 |
++AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include |
| 2283 |
++AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap |
| 2284 |
+ |
| 2285 |
+-LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ |
| 2286 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 2287 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 2288 |
+- $(top_builddir)/strings/libmystrings.a |
| 2289 |
++LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ |
| 2290 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 2291 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 2292 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 2293 |
++ $(ZLIB_LIBS) |
| 2294 |
+ |
| 2295 |
+-noinst_PROGRAMS = bitmap-t base64-t |
| 2296 |
++noinst_PROGRAMS = bitmap-t base64-t |
| 2297 |
+ |
| 2298 |
+ # Don't update the files from bitkeeper |
| 2299 |
+ %::SCCS/s.% |
| 2300 |
+Index: unittest/strings/Makefile.am |
| 2301 |
+=================================================================== |
| 2302 |
+--- unittest/strings/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2303 |
++++ unittest/strings/Makefile.am 2010-11-27 15:02:49.000000000 +0100 |
| 2304 |
+@@ -16,10 +16,11 @@ |
| 2305 |
+ AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include |
| 2306 |
+ AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap |
| 2307 |
+ |
| 2308 |
+-LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ |
| 2309 |
+- $(top_builddir)/mysys/libmysys.a \ |
| 2310 |
+- $(top_builddir)/dbug/libdbug.a \ |
| 2311 |
+- $(top_builddir)/strings/libmystrings.a |
| 2312 |
++LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ |
| 2313 |
++ $(top_builddir)/mysys/libmysys.la \ |
| 2314 |
++ $(top_builddir)/dbug/libdbug.la \ |
| 2315 |
++ $(top_builddir)/strings/libmystrings.la \ |
| 2316 |
++ $(ZLIB_LIBS) |
| 2317 |
+ |
| 2318 |
+ noinst_PROGRAMS = strings-t |
| 2319 |
+ |
| 2320 |
+Index: vio/Makefile.am |
| 2321 |
+=================================================================== |
| 2322 |
+--- vio/Makefile.am.orig 2010-11-27 15:02:45.000000000 +0100 |
| 2323 |
++++ vio/Makefile.am 2010-11-27 19:43:02.000000000 +0100 |
| 2324 |
+@@ -16,11 +16,11 @@ |
| 2325 |
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ |
| 2326 |
+ $(openssl_includes) |
| 2327 |
+ LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) |
| 2328 |
+-pkglib_LIBRARIES = libvio.a |
| 2329 |
++noinst_LTLIBRARIES = libvio.la |
| 2330 |
+ |
| 2331 |
+ noinst_HEADERS = vio_priv.h |
| 2332 |
+ |
| 2333 |
+-libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c |
| 2334 |
++libvio_la_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c |
| 2335 |
+ |
| 2336 |
+ EXTRA_DIST= CMakeLists.txt |
| 2337 |
+ |
Archives