diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
| commit | f900b6581021d119376660e6a65166cd74de0a5d (patch) | |
| tree | 6e8a3e15bb0980c034b6b2092fee3b9d6bd5d237 /storage/xtradb/plug.in | |
| parent | 721a6a6a6d3de10d24396ba96d6b8a013080f843 (diff) | |
| download | mariadb-git-f900b6581021d119376660e6a65166cd74de0a5d.tar.gz | |
Merge of innodb_plugin for MySQL 5.1.53 with xtradb
Fixed compiler warnings in xtradb
Added back resetting of null bitmap but now in row_search_for_mysql()
storage/xtradb/row/row0sel.c:
Added back resetting of null bitmap but now in row_search_for_mysql()
Diffstat (limited to 'storage/xtradb/plug.in')
| -rw-r--r-- | storage/xtradb/plug.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in index 67f25755762..b68b59725d4 100644 --- a/storage/xtradb/plug.in +++ b/storage/xtradb/plug.in @@ -141,10 +141,11 @@ MYSQL_PLUGIN_ACTIONS(xtradb, [ 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 \ |