Viewing all changes in revision 1039.5.59.
- Committer: Jay Pipes
- Date: 2009-09-16 17:10:18 UTC
- mfrom: (1126 staging)
- mto: (1143.2.1 replication-group-commit)
- mto: This revision was merged to the branch mainline in revision 1130.
- Revision ID: jpipes@serialcoder-20090916171018-5mk7xo3s0sokitzw
Merge trunk and resolve conflicts.
- files added:
- drizzled/message/table_raw_reader.cc
- drizzled/optimizer
- drizzled/slot
- files removed:
- drizzled/connect.h
- files renamed:
- drizzled/function/create.h => drizzled/plugin/function.h
- drizzled/plugin_registry.cc => drizzled/plugin/registry.cc
- drizzled/plugin_registry.h => drizzled/plugin/registry.h
- drizzled/sql_udf.cc => drizzled/slot/function.cc
- drizzled/sql_udf.h => drizzled/slot/function.h
- drizzled/listen.cc => drizzled/slot/listen.cc
- drizzled/listen.h => drizzled/slot/listen.h
- drizzled/command.h => drizzled/statement.h
- drizzled/command/ => drizzled/statement/
- m4/extensions.m4 => m4/pandora_extensions.m4
- files modified:
- Makefile.am
expand all
collapse all
added
removed
