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

Fixed a bad merge.

Browse source 
Changed a test case to make its result set platform independent.
This commit is contained in:
Igor Babaev 2011-10-03 21:36:18 -07:00
commit a55f0cabcb
3 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_select.cc
View file

@ -17969,12 +17969,6 @@ skipped_filesort:
delete save_quick;
save_quick= NULL;
}
/*
orig_cond is a part of pre_idx_push_cond,
no need to restore it.
*/
orig_cond= 0;
orig_cond_saved= false;
if (orig_cond_saved && !changed_key)
tab->set_cond(orig_cond);
DBUG_RETURN(1);