into moonbone.local:/work/12887-bug-5.0-mysql

into moonbone.local:/work/12887-bug-5.0-mysql

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into moonbone.local:/work/12887-bug-5.0-mysql

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  selena.:H:/MYSQL/src/fin-mysql-5.0

into moonbone.local:/work/12887-bug-4.1-mysql

For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
optimized away becuase such queries produce result set without duplicates.
But ROLLUP can add rows which may be same to some rows and this fact was
ignored.

Added check so if ROLLUP is present DISTINCT can't be optimized away.

into moonbone.local:/work/11416-bug-5.0-mysql

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  selena.:H:/MYSQL/src/fin-mysql-5.0

into  mysql.com:/home/my/mysql-4.1

Ignored some generated files

into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  mysql.com:/export/space/pekka/ndb/version/my50

into  mysql.com:/export/space/pekka/ndb/version/my50

  been branched off)

- tagged this ChangeSet as "clone-5.0.13-build"

      IGNORE on merge 4.1->5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  new file

  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029

into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029

into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526

into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029