Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (

into hundin.mysql.fi:/home/marko/mysql-5.0-current

- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling

Better fix for ON DUPLICATE KEY UPDATE

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

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

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

  Enable build with CXX=gcc and gcc version 4

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

  Optimize speed: no need to keep track of set new rec locks in a consistent read

into hundin.mysql.fi:/home/heikki/mysql-5.0

  Fix another bug in the fix of Bug #3300

  Fix bug in the Bug #3300 bug fix

  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1

into mysql.com:/home/svoj/devel/mysql/yassl1-mysql-5.0

into  mysql.com:/home/pem/work/mysql-5.0

Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.

into  mysql.com:/home/pem/work/mysql-5.0

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

into  mysql.com:/home/pem/work/mysql-5.0

into  mysql.com:/opt/local/work/mysql-5.0-11172-new

into rurik.mysql.com:/home/igor/mysql-5.0

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

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

We want to have the defacto standard syntax for labels ("L:" instead of "label L;"),
and fix some known bugs, before we enable this again.
The code is left intact (#ifdef'ed SP_GOTO) and the test cases are kept in
sp-goto.test, for the future...

    Add a test case for Bug#11656 "Server crash with mysql_stmt_fetch 
    (cursors)", the bug itself is no longer present.

into  mysql.com:/opt/local/work/mysql-5.0-11172-new

CURSOR_TYPE_READ_ONLY date/datetime filter server crash".
The fix adds support for Item_change_list in cursors (proper rollback
of the modified item tree). 

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0