to assign a potential existing mysql user to the correct user group (BUG#12823) 

  1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.

into mysql.com:/space/my/mysql-4.0-build

into moonbone.local:/work/7672-bug-4.0-mysql

When fixing Item_func_plus in ORDER BY clause field c is searched in all
opened tables, but because c is an alias it wasn't found there.

This patch adds a flag to select_lex which allows Item_field::fix_fields() 
to look up in select's item_list to find aliased fields.

in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)

into  mysql.com:/home/mydev/mysql-4.0-4000

   spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)

Second platform fix for floating point rounding.

Reduced the precision of the test numbers.
Not all platforms could reproduce the exact numbers.

The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by 
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key 
length of the search key.

  Delete: man/which.2

Ignored some generated files

Enlarged the counter variables to ulonglong.

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  kite-hub.kitebird.com:/tmp/merge-4.0

  Update README (2nd try)

into mysql.com:/M40/mysql-4.0

  Flag -DHAVE_DARWIN_THREADS not needed for darwin9

into  mysql.com:/home/hartmut/projects/mysql/dev/4.0

to be built successfully.

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

  Back port of QNX work around for rint()

  Back port of code to find the right 'ps' settings

read timeout properly on win32.

  Update test result.

  Reorder out-of-order system variables.

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

  Make ports configurable from environment for test

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

  Reorder out-of-order status variables.

  Reorder out-of-order system variables.