← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/mysql_priv.h

Committer: Stewart Smith
Date: 2008-07-09 15:56:26 UTC
mfrom: (108.1.1 drizzle)
mto: (54.1.6 drizzle-smack)
mto: This revision was merged to the branch mainline in revision 111.
Revision ID: stewart@flamingspork.com-20080709155626-u3rtj0gfno7y6pg1

merge upstream

files modified:
INSTALL

sql/drizzled.cc

sql/handler.cc

sql/handler.h

sql/lex.h

sql/mysql_priv.h

sql/sql_class.cc

sql/sql_class.h

sql/sql_lex.h

sql/sql_table.cc

sql/sql_yacc.yy

sql/table.cc

sql/table.h

sql/unireg.cc

Show diffs side-by-side

added added

removed removed

sql/mysql_priv.h

1033

1033

bool mysql_xa_recover(THD *thd);

1034

1034

1035

1035

bool check_simple_select();

1036

int mysql_alter_tablespace(THD* thd, st_alter_tablespace *ts_info);

1037

1036

1038

1037

SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length,

1039

1038

SORT_FIELD *sortorder);

Older »