~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin.h

Committer: Monty Taylor
Date: 2009-12-14 20:19:41 UTC
mfrom: (1240.9.6 icc-warnings)
mto: (1241.12.9 out-of-tree) (1253.2.3 out-of-tree)
mto: This revision was merged to the branch mainline in revision 1250.
Revision ID: mordred@inaugust.com-20091214201941-5wrk9ot278s0t42y

Merged in some icc warning fixes that also had something to do with the plugin header.

files modified:
drizzled/cursor.cc

drizzled/ha_commands.cc

drizzled/item/ref.h

drizzled/open_tables_state.h

drizzled/plugin.h

drizzled/plugin/storage_engine.cc

drizzled/plugin/storage_engine.h

drizzled/session.cc

drizzled/session.h

drizzled/sql_alloc.h

drizzled/sql_lex.h

drizzled/temporal.h

plugin/innobase/handler/ha_innodb.cc

Show diffs side-by-side

added added

removed removed

drizzled/plugin.h

405

const char *get_session_proc_info(Session *session);

406

int64_t session_test_options(const Session *session, int64_t test_options);

407

int session_sql_command(const Session *session);

408

void **session_ha_data(const Session *session, const drizzled::plugin::StorageEngine *engine);

409

408

int session_tx_isolation(const Session *session);

410

409

411

410

509

508

}

510

509

#endif

511

510

512

513

511

#endif /* DRIZZLED_PLUGIN_H */

514

512

Older »