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

[t:2557], fix compilation error

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@19817 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-17 00:02:00 -04:00 • committed by Yoni Fogel
parent 68489e8585
commit 3bd4ae3637
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
storage/tokudb/Makefile.in
View file

@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/alloca.m4 \
$(top_srcdir)/config/ac-macros/character_sets.m4 \
$(top_srcdir)/config/ac-macros/compiler_flag.m4 \
$(top_srcdir)/config/ac-macros/plugins.m4 \
$(top_srcdir)/config/ac-macros/dtrace.m4 \
$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
$(top_srcdir)/config/ac-macros/large_file.m4 \
$(top_srcdir)/config/ac-macros/misc.m4 \
@ -155,6 +156,8 @@ DEPDIR = @DEPDIR@
DIFF = @DIFF@
DOT_FRM_VERSION = @DOT_FRM_VERSION@
DOXYGEN = @DOXYGEN@
DTRACE = @DTRACE@
DTRACEFLAGS = @DTRACEFLAGS@
DVIS = @DVIS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
@ -166,7 +169,13 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FIND_PROC = @FIND_PROC@
GETCONF = @GETCONF@
GREP = @GREP@
GXX = @GXX@
HAVE_DTRACE = @HAVE_DTRACE@
HAVE_DTRACE_DASH_G_FALSE = @HAVE_DTRACE_DASH_G_FALSE@
HAVE_DTRACE_DASH_G_TRUE = @HAVE_DTRACE_DASH_G_TRUE@
HAVE_DTRACE_FALSE = @HAVE_DTRACE_FALSE@
HAVE_DTRACE_TRUE = @HAVE_DTRACE_TRUE@
HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@
HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@
HAVE_YASSL_FALSE = @HAVE_YASSL_FALSE@
@ -248,6 +257,7 @@ PERL5 = @PERL5@
PROTOCOL_VERSION = @PROTOCOL_VERSION@
PS = @PS@
RANLIB = @RANLIB@
RDTSC_SPARC_ASSEMBLY = @RDTSC_SPARC_ASSEMBLY@
RM = @RM@
SAVE_ASFLAGS = @SAVE_ASFLAGS@
SAVE_CC = @SAVE_CC@
@ -277,14 +287,9 @@ YACC = @YACC@
ZLIB_DEPS = @ZLIB_DEPS@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_GETCONF = @ac_ct_GETCONF@
ac_ct_NM = @ac_ct_NM@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -305,7 +310,10 @@ condition_dependent_plugin_links = @condition_dependent_plugin_links@
condition_dependent_plugin_modules = @condition_dependent_plugin_modules@
condition_dependent_plugin_objects = @condition_dependent_plugin_objects@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
docs_dirs = @docs_dirs@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
extra_docs = @extra_docs@
host = @host@
@ -313,23 +321,25 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
innodb_system_libs = @innodb_system_libs@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
libmysqld_dirs = @libmysqld_dirs@
localedir = @localedir@
localstatedir = @localstatedir@
man1_files = @man1_files@
man8_files = @man8_files@
man_dirs = @man_dirs@
mandir = @mandir@
mkdir_p = @mkdir_p@
mysql_mandatory_plugins = @mysql_mandatory_plugins@
mysql_optional_plugins = @mysql_optional_plugins@
mysql_pg_dirs = @mysql_pg_dirs@
mysql_pg_distdirs = @mysql_pg_distdirs@
mysql_pg_unittest_dirs = @mysql_pg_unittest_dirs@
mysql_plugin_defs = @mysql_plugin_defs@
mysql_plugin_dirs = @mysql_plugin_dirs@
mysql_plugin_libs = @mysql_plugin_libs@
mysql_se_dirs = @mysql_se_dirs@
@ -348,8 +358,11 @@ netware_dir = @netware_dir@
oldincludedir = @oldincludedir@
openssl_includes = @openssl_includes@
openssl_libs = @openssl_libs@
pdfdir = @pdfdir@
plugin_archive_shared_target = @plugin_archive_shared_target@
plugin_archive_static_target = @plugin_archive_static_target@
plugin_audit_null_shared_target = @plugin_audit_null_shared_target@
plugin_audit_null_static_target = @plugin_audit_null_static_target@
plugin_blackhole_shared_target = @plugin_blackhole_shared_target@
plugin_blackhole_static_target = @plugin_blackhole_static_target@
plugin_csv_shared_target = @plugin_csv_shared_target@
@ -364,8 +377,6 @@ plugin_ibmdb2i_shared_target = @plugin_ibmdb2i_shared_target@
plugin_ibmdb2i_static_target = @plugin_ibmdb2i_static_target@
plugin_innobase_shared_target = @plugin_innobase_shared_target@
plugin_innobase_static_target = @plugin_innobase_static_target@
plugin_innodb_plugin_shared_target = @plugin_innodb_plugin_shared_target@
plugin_innodb_plugin_static_target = @plugin_innodb_plugin_static_target@
plugin_myisam_shared_target = @plugin_myisam_shared_target@
plugin_myisam_static_target = @plugin_myisam_static_target@
plugin_myisammrg_shared_target = @plugin_myisammrg_shared_target@
@ -374,10 +385,15 @@ plugin_ndbcluster_shared_target = @plugin_ndbcluster_shared_target@
plugin_ndbcluster_static_target = @plugin_ndbcluster_static_target@
plugin_partition_shared_target = @plugin_partition_shared_target@
plugin_partition_static_target = @plugin_partition_static_target@
plugin_perfschema_shared_target = @plugin_perfschema_shared_target@
plugin_perfschema_static_target = @plugin_perfschema_static_target@
plugin_semisync_shared_target = @plugin_semisync_shared_target@
plugin_semisync_static_target = @plugin_semisync_static_target@
plugin_tokudb_shared_target = @plugin_tokudb_shared_target@
plugin_tokudb_static_target = @plugin_tokudb_static_target@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pstack_dir = @pstack_dir@
pstack_libs = @pstack_libs@
readline_basedir = @readline_basedir@
@ -398,7 +414,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
tools_dirs = @tools_dirs@
uname_prog = @uname_prog@
yassl_dir = @yassl_dir@
yassl_h_ln_cmd = @yassl_h_ln_cmd@

4
storage/tokudb/ha_tokudb.cc
View file

@ -5105,13 +5105,13 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
HA_TOKU_ISO_LEVEL toku_iso_level = tx_to_toku_iso(tx_isolation);
/* First table lock, start transaction */
if ((thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) &&
if (thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) &&
!trx->all &&
(thd_sql_command(thd) != SQLCOM_CREATE_TABLE) &&
(thd_sql_command(thd) != SQLCOM_DROP_TABLE) &&
(thd_sql_command(thd) != SQLCOM_ALTER_TABLE)) {
/* QQQ We have to start a master transaction */
DBUG_PRINT("trans", ("starting transaction all: options: 0x%lx", (ulong) thd->options));
// DBUG_PRINT("trans", ("starting transaction all "));
if ((error = db_env->txn_begin(db_env, NULL, &trx->all, toku_iso_to_txn_flag(toku_iso_level)))) {
trx->tokudb_lock_count--; // We didn't get the lock
goto cleanup;