diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-10-20 10:41:51 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-10-20 10:41:51 +0300 |
| commit | a2634cf7c827180a1ca94030ca9d085af6d933c2 (patch) | |
| tree | a73c482354fbee60c2da9dbbb3c61a0c38940c09 /storage/innobase/plug.in | |
| parent | 4735eafcddba5ba486e3b26211a6ab4fe25393f0 (diff) | |
| parent | cb0105066157343065f85eab019660dd20609f6c (diff) | |
| download | mariadb-git-a2634cf7c827180a1ca94030ca9d085af6d933c2.tar.gz | |
Merge mysql-5.1-innodb -> mysql-5.5-innodb
In the fix for Bug#53916 also apply equivalent changes to CMakeLists.txt
Diffstat (limited to 'storage/innobase/plug.in')
| -rw-r--r-- | storage/innobase/plug.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/plug.in b/storage/innobase/plug.in index 9367b70c52e..5fa82e585a4 100644 --- a/storage/innobase/plug.in +++ b/storage/innobase/plug.in @@ -146,10 +146,11 @@ MYSQL_PLUGIN_ACTIONS(innobase, [ AC_MSG_CHECKING(whether Solaris libc atomic functions are available) # either define HAVE_IB_SOLARIS_ATOMICS or not - AC_CHECK_FUNCS(atomic_add_long \ + AC_CHECK_FUNCS(atomic_cas_ulong \ atomic_cas_32 \ atomic_cas_64 \ - atomic_cas_ulong, + atomic_add_long_nv \ + atomic_swap_uchar, AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1], [Define to 1 if Solaris libc atomic functions \ |