~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.h

Committer: Eric Day
Date: 2009-08-05 07:25:08 UTC
mfrom: (1110 staging)
mto: (1110.1.2 plugin-slot-reorg) (971.6.4 eday-dev) (1093.1.53 captain)
mto: This revision was merged to the branch mainline in revision 1115.
Revision ID: eday@oddments.org-20090805072508-9zek3vjkel6ptvy1

Merged trunk, fixed some leftover InnoDB ICP code.

files removed:
drizzled/multi_delete.h

drizzled/multi_update.h

files modified:
drizzled/Makefile.am

drizzled/drizzled.cc

drizzled/enum.h

drizzled/handler.cc

drizzled/handler.h

drizzled/join.cc

drizzled/opt_range.cc

drizzled/records.cc

drizzled/session.h

drizzled/set_var.cc

drizzled/sql_delete.cc

drizzled/sql_lex.h

drizzled/sql_parse.cc

drizzled/sql_parse.h

drizzled/sql_select.cc

drizzled/sql_select.h

drizzled/sql_update.cc

drizzled/sql_yacc.yy

drizzled/table_list.h

plugin/innobase/handler/ha_innodb.cc

plugin/myisam/ha_myisam.cc

plugin/myisam/ha_myisam.h

plugin/myisam/mi_extra.cc

tests/include/mix2.inc

tests/include/unsafe_binlog.inc

tests/lib/mtr_report.pl

tests/r/delete.result

tests/r/derived.result

tests/r/information_schema.result

tests/r/innodb.result

tests/r/mix2_myisam.result

tests/r/myisam.result

tests/r/subselect.result

tests/r/subselect_no_mat.result

tests/r/subselect_no_mat_and_semi_join.result

tests/r/subselect_no_opts.result

tests/r/subselect_no_semijoin.result

tests/r/type_timestamp.result

tests/r/unsafe_binlog_innodb.result

tests/r/update.result

tests/suite/big/r/variables-big.result

tests/suite/big/t/variables-big.test

tests/t/delete.test

tests/t/derived.test

tests/t/innodb.test

tests/t/myisam.test

tests/t/subselect.test

tests/t/type_timestamp.test

tests/t/update.test

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

drizzled/sql_select.h

315

#include "drizzled/stored_key.h"

316

317

bool cp_buffer_from_ref(Session *session, table_reference_st *ref);

318

bool error_if_full_join(JOIN *join);

319

318

int safe_index_read(JoinTable *tab);

320

319

COND *remove_eq_conds(Session *session, COND *cond, Item::cond_result *cond_value);

321

320

int test_if_item_cache_changed(List<Cached_item> &list);

Older »