into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25302

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443

           server

The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE).  Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".

The solution is:
 - pass MY_WME to (some) calls to my_malloc() to get correct message.
 - fix heap_write() so that the first key is skipped during cleanup
   on ENOMEM because it wasn't inserted and doesn't have to be
   deleted.

No test case is provided because we can't test out-of-memory behaviour
in our current test framework.

This fix corrects build issues introduced by WL#3031:

- In the SQL grammar, 'USER' is a SQL 2003 reserved keyword,
and therefore should not be part of the keyword production.

- In sql/sql_parse.cc, the code for CREATE SERVER and ALTER SERVER
was not using proper format strings in the DBUG_PRINT statements.

Merge 5.1-main -> 5.1-runtime, added ignore entry for missing symbolic link

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge

into  trift2.:/MySQL/M51/mysql-5.1

    Delete compiler-specific flag setting - it makes builds break.

into  mysql.com:/home/kent/bk/main/mysql-5.1

  Temporary work around for bug#25359

  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header

into  mysql.com:/home/kent/bk/main/mysql-5.1

into  mysql.com:/home/kent/bk/main/mysql-5.1

into  mysql.com:/home/kent/bk/main/mysql-5.0

  Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

into  poseidon.:/home/tomas/mysql-5.1-new-ndb

into  mysql.com:/home/kent/bk/main/mysql-5.1

  Changed header to GPL version 2 only

into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge

into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge

into  mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines

            repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.

into  mysql.com:/home/kent/bk/main/mysql-5.1

  Changed header to GPL version 2 only

into  mysql.com:/home/kent/bk/main/mysql-5.1

into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge

before referencing it.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb

   Fix uninitialized memory.