Problem: Unescaping of '\' characters didn't work when processing N'xxx'.
Fix: using get_text() instead of get_token() when scanning nationa strings.

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

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

Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection.  Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.

The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space.  Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE.  Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.

The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

The fix is: if user has privileges to view fields and user has any
(insert,select,delete,update) privileges on underlying view 
then 'show fields' and select from I_S.COLUMNS table are sucsessful.

    (Re-apply a patch from the general tree to the clone.)

      BUG#20850: Assert during slave shutdown in many rpl_* tests
      This patch has already been applied to 5.1.

into  mysql.com:/home/hf/work/mysql-5.0.mrg

into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt

into  trift2.:/M50/merge-4.1-to-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

  Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
  Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
  Always generate 'pdb' and 'map' files

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

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

on Windows.

Code added to look for different names on Windows

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

- Adapt it to work with the handlerton class

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

"real" table fails in JOINs".

This is a regression caused by the fix for Bug 18444. 
This fix removed the assignment of empty_c_string to table->db performed 
in add_table_to_list, as neither me nor anyone else knew what it was 
there for. Now we know it and it's covered with tests: the only case 
when a table database name can be empty is when the table is a derived 
table. The fix puts the assignment back but makes it a bit more explicit.

Additionally, finally drop sp.result.orig which was checked in by mistake. 

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0

 - backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge

REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.

Post merge changes.

  Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  rama.(none):/home/jimw/my/mysql-5.0-17608