« back to all changes in this revision
Viewing changes to drizzled/sql_error.cc
- Committer: Jay Pipes
- Date: 2009-10-19 19:19:38 UTC
- mfrom: (1188 staging)
- mto: (1234.1.1 push) (1237.2.10 push)
- mto: This revision was merged to the branch mainline in revision 1193.
- Revision ID: jpipes@serialcoder-20091019191938-v5572lg15d5o7veo
Merge trunk and resolve all conflicts.
- files added:
- drizzled/file_exchange.cc
- drizzled/memory
- files renamed:
- drizzled/handler.cc => drizzled/cursor.cc
- drizzled/handler.h => drizzled/cursor.h
- mysys/mulalloc.cc => drizzled/memory/multi_malloc.cc
- drizzled/registry.h => drizzled/name_map.h
- plugin/heap/heapdef.h => plugin/heap/heap_priv.h
- plugin/myisam/myisamdef.h => plugin/myisam/myisam_priv.h
- files modified:
- Makefile.am
added
removed
drizzled/sql_error.cc
