FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete

into the column character set on INSERT/UPDATE.

into mysql.com:/M41/mysql-4.1

args[0] is now used instead.

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

Windows style line end \r\n on README, license, and similar essential plaintext files.

numeric columns (stmt_resultset_metadata)"

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

improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)

  Link adaptive hash index entries to the buffer page, so that we can remove them quickly without knowing the record structure on that page; this was requested by Marko for the compact InnoDB table format; note that the adaptive hash index memory overhead grows by 67 %, maybe we have to tune this later somehow

reason for the failure was found, so the guess is that it is a 
compiler bug.

Field_string::pack should respect max_length as Field_string::pack_key does

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

  Print to the .err log a more detailed error message if in IMPORT TABLESPACE the .ibd file does not exist

  Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
os0file.c:
  Do not call exit(1) if os_file_delete() fails; remove unused parameter from
handle_error_no_exit()

fil0fil.c:
  Allow DROP TABLE even if the .ibd file for the table does not exist

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

 - tagged ChangeSet 1.2029 as "mysql-4.1.7"

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

New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb

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

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1

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

The same problem with SET columns:

find_set() now executes find_type2() to do charset aware search,
instead of always using system_charset_info comparison.

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1

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