« back to all changes in this revision
Viewing changes to mysys/my_alloc.h
- Committer: Eric Day
- Date: 2009-10-31 21:53:33 UTC
- mfrom: (1200 staging)
- mto: This revision was merged to the branch mainline in revision 1202.
- Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.
- files added:
- drizzled/file_exchange.cc
- drizzled/hash
- drizzled/memory
- plugin/information_engine
- plugin/memcached_functions
- tests/suite/memcached_functions
- tests/suite/memcached_functions/r
- tests/suite/memcached_functions/t
- files removed:
- drizzled/message/command_reader.cc
- files renamed:
- drizzled/handler.cc => drizzled/cursor.cc
- drizzled/handler.h => drizzled/cursor.h
- drizzled/crc32.cc => drizzled/hash/crc32.cc
- drizzled/crc32.h => drizzled/hash/crc32.h
- mysys/mulalloc.cc => drizzled/memory/multi_malloc.cc
- drizzled/registry.h => drizzled/name_map.h
- drizzled/plugin/command_applier.cc => drizzled/plugin/transaction_applier.cc
- drizzled/plugin/command_applier.h => drizzled/plugin/transaction_applier.h
- drizzled/plugin/command_reader.h => drizzled/plugin/transaction_reader.h
- drizzled/plugin/command_replicator.cc => drizzled/plugin/transaction_replicator.cc
- drizzled/plugin/command_replicator.h => drizzled/plugin/transaction_replicator.h
- plugin/heap/heapdef.h => plugin/heap/heap_priv.h
- plugin/innobase/plugin.am => plugin/innobase/Makefile.am
- plugin/innobase/plugin.ac => plugin/innobase/plug.in
- plugin/myisam/myisamdef.h => plugin/myisam/myisam_priv.h
- plugin/command_log/ => plugin/transaction_log/
- plugin/command_log/command_log.cc => plugin/transaction_log/transaction_log.cc
- plugin/command_log/command_log.h => plugin/transaction_log/transaction_log.h
- plugin/command_log/command_log_reader.cc => plugin/transaction_log/transaction_log_reader.cc
- plugin/command_log/command_log_reader.h => plugin/transaction_log/transaction_log_reader.h
- tests/suite/command_log/ => tests/suite/transaction_log/
- files modified:
- Makefile.am
added
removed
mysys/my_alloc.h
