into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

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

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

  Added flag --valgrind-mysqltest

  big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 

  
This is backport from 5.0 of fix for bug #11039

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

  Delete: man/which.2

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

  Enabled --valgrind to work (bug#13280)

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

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  mysql.com:/home/jimw/my/mysql-4.1-clean

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

Ignored some generated files

      IGNORE on merge 4.1->5.0

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

into  mysql.com:/home/mydev/mysql-4.1-4100

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

 present): the problem originally was that the tables in auxilliary_tables did not have 
the correct real_name, which caused problems in the second call to tables_ok(). 
The fix corrects the real_name problem, and also sets the updating flag properly, 
which makes the second call to tables_ok() unnecessary.

After merge fix.

into  mysql.com:/home/mydev/mysql-4.1-4100

Enlarged the counter variables to ulonglong.

into  mysql.com:/home/mydev/mysql-4.1-4100

Solution for 4.0 and 4.1.
If the caller cannot re-open table(s), it gives a NULL
'refresh' argument to open_table(). We used to ignore
flushes then. Now we ignore drops too.

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

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

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

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

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