mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#3011 remove *extra from *multiple refs[t:3011]

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@25648 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2010-11-15 20:02:32 +00:00 committed by Yoni Fogel
parent b894c743fe
commit afe751ef05
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/tokudb/Makefile.in
View file

@ -45,7 +45,8 @@ subdir = storage/tokudb
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/alloca.m4 \
am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/maintainer.m4 \
$(top_srcdir)/config/ac-macros/alloca.m4 \
$(top_srcdir)/config/ac-macros/check_cpu.m4 \
$(top_srcdir)/config/ac-macros/character_sets.m4 \
$(top_srcdir)/config/ac-macros/compiler_flag.m4 \
@ -105,6 +106,8 @@ ALLOCA = @ALLOCA@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CXXFLAGS = @AM_CXXFLAGS@
AR = @AR@
ARFLAGS = @ARFLAGS@
AS = @AS@
@ -404,6 +407,7 @@ yassl_dir = @yassl_dir@
yassl_h_ln_cmd = @yassl_h_ln_cmd@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
yassl_thread_cxxflags = @yassl_thread_cxxflags@
zlib_dir = @zlib_dir@
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)

3
storage/tokudb/ha_tokudb.cc
View file

@ -1137,8 +1137,7 @@ int generate_row_for_put(
DBT *dest_key,
DBT *dest_val,
const DBT *src_key,
const DBT *src_val,
void *extra
const DBT *src_val
)
{
return tokudb_generate_row(