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

- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806

into xiphis.org:/usr/home/antony/work2/p1-bug11028.4

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

  Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.

  Report error instead of crashing

CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.

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

into mysql.com:/home/gluh/MySQL/Merge/4.1

  generate proper error message if we use SET ... = NULL for 'set'
  variables

into mysql.com:/home/jonas/src/mysql-4.1-push

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

into deer.(none):/home/hf/work/mysql-5.0.8482

a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.).

into mysql.com:/home/jonas/src/mysql-4.1-push

  small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

bug#10711
bug#10058
bug#9363
bug#9025
bug#8918

into mysql.com:/home/dlenev/src/mysql-5.0-bgmd

This is to close Bug#10975, Bug#7115, Bug#10605 
This feature will be implemented in a future release.

In order to make multi-delete SP friendly we need to have all table 
locks for the elements of main statement table list properly set 
at the end of parsing.

Also performed small cleanup: We don't need relink_tables_for_multidelete()
any longer since the only case now when TABLE_LIST::correspondent_table
is non-zero are tables in auxilary table list of multi-delete and these
tables are handled specially in mysql_multi_delete_prepare().

Fix for yaSSL compilation failure on ia64 platform.

into deer.(none):/home/hf/work/mysql-5.0.9764

into deer.(none):/home/hf/work/mysql-5.0.9764

into mysql.com:/home/jonas/src/mysql-5.0

  Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts

into mysql.com:/home/hf/work/mysql-5.0.8459

into mysql.com:/space/my/mysql-5.0

  "make install" is called (mysql_delimiter.sql was missing)