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.


sql/sql_select.cc:
  Fix bug #12887 Distinct is not always applied after rollup
mysql-test/r/olap.result:
  Test case for bug #12887 Distinct is not always applied after rollup
mysql-test/t/olap.test:
  Test case for bug #12887 Distinct is not always applied after rollup

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


configure.in:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged

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

mysql-test/r/ndb_autodiscover.result:
  Update results

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1

into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged

into  kite-hub.kitebird.com:/tmp/merge-4.1

into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged

  Update README (2nd try)


README:
  Update README (2nd try)

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


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

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

Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into  eel.(none):/home/jonas/src/mysql-4.1-push

  produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists

corrected typo in ndb Parser

into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus

into  eel.(none):/home/jonas/src/mysql-4.1-push

to eliminate nondeterminism in slave start

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push

sql/sql_parse.cc:
  Optimization, this reset is executed below anyway

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push

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

  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.


mysql-test/t/insert_select.test:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
mysql-test/r/insert_select.result:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  mysql.com:/home/alexi/dev/mysql-4.1-12101

into  eel.(none):/home/jonas/src/mysql-4.1-push

Added test case.