← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/memory_xt.cc

Committer: Hartmut Holzgraefe
Date: 2010-08-27 15:50:26 UTC
mfrom: (1733 trunk)
mto: (1730.6.3 drizzle-make-lcov)
mto: This revision was merged to the branch mainline in revision 1810.
Revision ID: hartmut@hartmut-laptop-20100827155026-ez7pm1ggrdd2axu4

merge from upstream

files modified:
plugin/memcached_query_cache/tests/t/query_cache_basic-master.opt

plugin/memcached_query_cache/tests/t/query_cache_flush-master.opt

plugin/memcached_query_cache/tests/t/query_cache_invalidation-master.opt

plugin/memcached_query_cache/tests/t/query_cache_udf-master.opt

plugin/pbxt/src/memory_xt.cc

plugin/pbxt/src/myxt_xt.cc

plugin/pbxt/src/xt_defs.h

plugin/transaction_log/tests/r/select_for_update.result

plugin/transaction_log/tests/t/select_for_update.inc

tests/include/mix1.inc

tests/r/innodb-semi-consistent.result

tests/r/innodb.result

tests/r/innodb_mysql.result

tests/t/innodb-semi-consistent.test

tests/t/innodb.test

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

plugin/pbxt/src/memory_xt.cc

34

34

#include "trace_xt.h"

35

35

36

36

#ifdef DEBUG

37

#define RECORD_MM

37

//#define RECORD_MM

38

38

#endif

39

39

40

40

#ifdef DEBUG

Older »