~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/plug.in

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
18
18
        [Transactional Tables using InnoDB], [max,max-no-ndb])
19
19
MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
 
20
# Enable if you know what you are doing (trying to link both InnoDB and
 
21
# InnoDB Plugin statically into MySQL does not work).
 
22
#MYSQL_PLUGIN_STATIC(innodb_plugin, [libinnobase.a])
20
23
MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
21
24
MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
22
25
  AC_CHECK_HEADERS(sched.h)
136
139
  )
137
140
 
138
141
  AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
139
 
  # either define HAVE_IB_SOLARIS_ATOMICS or not
140
 
  AC_CHECK_FUNCS(atomic_cas_ulong \
 
142
  # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
 
143
  # functions are present.
 
144
  AC_CHECK_FUNCS(atomic_add_long_nv \
141
145
                 atomic_cas_32 \
142
146
                 atomic_cas_64 \
143
 
                 atomic_add_long_nv \
144
 
                 atomic_swap_uchar,
145
 
 
146
 
                 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
147
 
                           [Define to 1 if Solaris libc atomic functions \
148
 
                            are available])
149
 
  )
 
147
                 atomic_cas_ulong \
 
148
                 atomic_swap_uchar)
 
149
 
 
150
  if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \
 
151
          "${ac_cv_func_atomic_cas_32}" = "yes" -a \
 
152
          "${ac_cv_func_atomic_cas_64}" = "yes" -a \
 
153
          "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \
 
154
          "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then
 
155
 
 
156
    AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
 
157
      [Define to 1 if Solaris libc atomic functions are available]
 
158
    )
 
159
  fi
150
160
 
151
161
  AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
152
162
  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not