← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.h

  • Committer: Monty Taylor
  • Date: 2010-03-11 19:38:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: mordred@inaugust.com-20100311193804-imfslpvq9dy02l6o
Cleaned up merge errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.h
682
682
extern const char *ha_row_type[];
683
683
 
684
684
/* basic stuff */
685
 
int ha_init_errors(void);
686
 
int ha_end(void);
 
685
void ha_init_errors(void);
687
686
 
688
687
SORT_FIELD * make_unireg_sortorder(order_st *order, uint32_t *length,
689
688
                                   SORT_FIELD *sortorder);