diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-04 15:39:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-04 15:39:09 +0300 |
| commit | ba38e6014fca941172f284148fc251051c5a7d7e (patch) | |
| tree | 389961a1f7492f21bf1f330076d1d624e68c5a33 /strings | |
| parent | 5e690da12a6b2a54d1ae3add9a7c013bd191bd29 (diff) | |
| parent | 34436edb4dd38f30d0f155e0a5fe484754ec5846 (diff) | |
| download | mariadb-git-ba38e6014fca941172f284148fc251051c5a7d7e.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index ddd41e627dc..4c34a923d81 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,16 @@ # This file is public domain and comes with NO WARRANTY of any kind -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +# +# Note that the string library is built with #define THREAD, +# which by default cause all the thread related code (my_pthread.h) +# and therefore the associated instrumentation (mysql/psi/mysql_thread.h) +# to be used. +# Since the string code itself is not instrumented, we use +# #define DISABLE_MYSQL_THREAD_H here to avoid unneeded dependencies. +# + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -DDISABLE_MYSQL_THREAD_H pkglib_LIBRARIES = libmystrings.a # Exact one of ASSEMBLER_X |