← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Monty Taylor
  • Date: 2010-03-11 18:27:20 UTC
  • mfrom: (1333 staging)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: mordred@inaugust.com-20100311182720-hd1h87y6cb1b1mp0
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
337
337
  if (error)
338
338
    goto err;
339
339
 
 
340
  /* 
 
341
   * The below will create the new table for
 
342
   * CREATE TABLE ... SELECT
 
343
   *
 
344
   * @see create_table_from_items() in drizzled/sql_insert.cc
 
345
   */
340
346
  if (result && result->prepare(fields_list, unit_arg))
341
347
    goto err;
342
348
 
5995
6001
  if (join->const_tables != join->tables)
5996
6002
  {
5997
6003
    optimize_keyuse(join, keyuse_array);
5998
 
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query, join->session->thread_id);
 
6004
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query.c_str(), join->session->thread_id);
5999
6005
    bool res= choose_plan(join, all_table_map & ~join->const_table_map);
6000
6006
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_DONE(res ? 1 : 0);
6001
6007
    if (res)