← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/structs.h

Committer: patrick crews
Date: 2011-06-18 01:41:21 UTC
mfrom: (2339 drizzle)
mto: (2429.2.1 dbqp_revamp)
mto: This revision was merged to the branch mainline in revision 2435.
Revision ID: gleebix@gmail.com-20110618014121-72zn6afnx5p6e6cn

Merge trunk

files modified:
client/drizzletest.cc

drizzled/filesort.cc

drizzled/join.cc

drizzled/memory/multi_malloc.cc

drizzled/memory/root.cc

drizzled/my_hash.cc

drizzled/my_hash.h

drizzled/plugin/storage_engine.cc

drizzled/sql_base.cc

drizzled/sql_select.cc

drizzled/sql_select.h

drizzled/sql_table.cc

drizzled/structs.h

drizzled/table.cc

drizzled/table_proto.cc

libdrizzle-2.0/libdrizzle/column.cc

libdrizzle-2.0/libdrizzle/conn.cc

libdrizzle-2.0/libdrizzle/drizzle.cc

libdrizzle-2.0/libdrizzle/field.cc

libdrizzle-2.0/libdrizzle/query.cc

libdrizzle-2.0/libdrizzle/result.cc

libdrizzle-2.0/libdrizzle/row.cc

plugin/auth_pam/auth_pam.cc

plugin/memory/hp_block.cc

plugin/signal_handler/signal_handler.cc

Show diffs side-by-side

added added

removed removed

drizzled/structs.h

18

18

* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

19

19

*/

20

20

21

/* The old structures from unireg */

22

23

21

#pragma once

24

22

25

23

#include <drizzled/base.h>

Older »