database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
This commit is contained in:
Alexander Nozdrin
2010-04-27 13:58:21 +04:00
parent a0f8951963 b6dcd0ecbe
commit e642701c32
182 changed files with 41913 additions and 11901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -4157,7 +4157,7 @@ is_indexed_agg_distinct(JOIN *join, List<Item_field> *out_args)
optimization is applicable
*/
if (out_args)
out_args->push_back((Item_field *) expr);
out_args->push_back((Item_field *) expr->real_item());
result= true;
}
}