Commit 9fed61c3 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/work/31048-bug-5.0-opt-mysql
parents 9b8751d4 12516abe

sql/sql_select.cc

+5 −0
Original line number Diff line number Diff line
@@ -2332,6 +2332,11 @@ static ha_rows get_quick_record_count(THD *thd, SQL_SELECT *select, 
{

  int error;

  DBUG_ENTER("get_quick_record_count");

#ifndef EMBEDDED_LIBRARY                      // Avoid compiler warning

  char buff[STACK_BUFF_ALLOC];

#endif

  if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))

    DBUG_RETURN(0);                           // Fatal error flag is set

  if (select)

  {

    select->head=table;