mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 11:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 5.1-release.

Browse source 
- Fixed problem with oqgraph and 'make dist'

Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
This commit is contained in:
Michael Widenius 2010-12-06 10:25:44 +02:00
commit b7b25dc666
604 changed files with 12849 additions and 6375 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_prepare.cc
View file

@ -2367,11 +2367,15 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
sl->where= sl->prep_where->copy_andor_structure(thd);
sl->where->cleanup();
}
else
sl->where= NULL;
if (sl->prep_having)
{
sl->having= sl->prep_having->copy_andor_structure(thd);
sl->having->cleanup();
}
else
sl->having= NULL;
DBUG_ASSERT(sl->join == 0);
ORDER *order;
/* Fix GROUP list */