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

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  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/bug13029/my50-bug13029

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

-Applied patch from Todd

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

into  mysql.com:/home/mydev/mysql-5.0-5000

 - Disable inlining in integer.cp for sparc solaris Cun C++ 5.6

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2

This bug occurs when some trigger for table used by DML statement is created
or changed while statement was waiting in lock_tables(). In this situation
prelocking set which we have calculated becames invalid which can easily lead
to errors and even in some cases to crashes.

With proposed patch we no longer silently reopen tables in lock_tables(),
instead caller of lock_tables() becomes responsible for reopening tables and
recalculation of prelocking set.

into  mysql.com:/home/eric/mysql-5.0-fed-err

into  mysql.com:/home/eric/mysql-5.0-fed-err