merge with 3.23.51

BitKeeper/etc/logging_ok:
  auto-union
Docs/glibc-2.2.5.patch:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/r/group_by.result:
  merge
sql/sql_select.cc:
  merge