After merge fix.

Merge from 4.1

After merge fix.

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

(Review on irc by monty)

into mysql.com:/M41/mysql-4.1

into mysql.com:/usr/home/ram/work/4.1.b9803

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

  Fix compilation error if HAVE_REPLICATION is not defined

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

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

  Correct an assertion

Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.

  Fix compilation error if HAVE_REPLICATION is not defined

  Fix linking and compilation errors

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

  Remove printf's from semi-sync code in sql_repl.cc

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

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

  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/M41/mysql-4.1

into mysql.com:/M50/mysql-5.0

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

  We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work.

into mysql.com:/home/jimw/my/mysql-5.0-build

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

into mysql.com:/usr/home/ram/work/5.0.b9489