~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

Committer: Padraig O'Sullivan
Date: 2010-02-16 01:55:51 UTC
mfrom: (1280.3.18 query-rewrite)
mto: (1273.13.95 build)
mto: This revision was merged to the branch mainline in revision 1307.
Revision ID: osullivan.padraig@gmail.com-20100216015551-di1pa1egtklnszzv

Merge with my query rewrite tree to change the query member in Session to std::string

files modified:
drizzled/db.cc

drizzled/drizzled.cc

drizzled/join.cc

drizzled/lex_input_stream.h

drizzled/plugin.h

drizzled/replication_services.cc

drizzled/replication_services.h

drizzled/session.cc

drizzled/session.h

drizzled/sql_lex.cc

drizzled/sql_parse.cc

drizzled/sql_select.cc

drizzled/sql_table.cc

drizzled/sql_table.h

drizzled/sql_update.cc

drizzled/statement/alter_table.cc

drizzled/statement/analyze.cc

drizzled/statement/delete.cc

drizzled/statement/flush.cc

drizzled/statement/insert.cc

drizzled/statement/insert_select.cc

drizzled/statement/rename_table.cc

plugin/innobase/dict/dict0dict.c

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/handler/ha_innodb.h

plugin/innobase/include/trx0trx.h

plugin/innobase/trx/trx0i_s.c

plugin/logging_query/logging_query.cc

plugin/logging_syslog/logging_syslog.cc

Show diffs side-by-side

added added

removed removed

drizzled/join.cc

5995

if (join->const_tables != join->tables)

5996

{

5997

optimize_keyuse(join, keyuse_array);

5998

DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query, join->session->thread_id);

5998

DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query.c_str(), join->session->thread_id);

5999

bool res= choose_plan(join, all_table_map & ~join->const_table_map);

6000

DRIZZLE_QUERY_OPT_CHOOSE_PLAN_DONE(res ? 1 : 0);

6001

if (res)

Older »