← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to sql/sql_derived.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_derived.cc
614
614
  SELECT_LEX_UNIT *unit= derived->get_unit();
615
615
  DBUG_ENTER("mysql_derived_prepare");
616
616
  bool res= FALSE;
 
617
  DBUG_PRINT("enter", ("unit 0x%lx", (ulong) unit));
617
618
 
618
619
  // Skip already prepared views/DT
619
620
  if (!unit || unit->prepared ||
623
624
          thd->lex->sql_command == SQLCOM_DELETE_MULTI))))
624
625
    DBUG_RETURN(FALSE);
625
626
 
626
 
  Query_arena *arena, backup;
627
 
  arena= thd->activate_stmt_arena_if_needed(&backup);
628
 
 
629
627
  SELECT_LEX *first_select= unit->first_select();
630
628
 
631
629
  /* prevent name resolving out of derived table */
743
741
    if (derived->outer_join)
744
742
      table->maybe_null= 1;
745
743
  }
746
 
  if (arena)
747
 
    thd->restore_active_arena(arena, &backup);
748
744
  DBUG_RETURN(res);
749
745
}
750
746