This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.

This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.

This patch was submitted by Ingo and it appears to work correctly.

sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

when reporting an error, use an appropriate buffer for udf->name

into mysql.com:/home/mydev/mysql-4.1-4100

After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().

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

into mysql.com:/space/pekka/ndb/version/my41

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1

  Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.

  Added missing ';'.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  updated error message for ndb

into mysql.com:/data0/mysqldev/my/mysql-4.1-build

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1

into mysql.com:/home/psergey/mysql-4.1-bug10095

into mysql.com:/home/psergey/mysql-4.1-bug10221

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings

into mysql.com:/home/psergey/mysql-4.0-bug10095

The problem: base_list::remove didn't modify base_list::last when removing 
the last list element.
The fix: If we remove the last element, find the element before it (by walking
from the beginning of the list) and set base_list::last accordingly.

The list gets corrupted in both 4.0 and 4.1. There are no visible problems in 
current 4.1 because current 4.1 doesn't call where_cond->fix_fields() after 
constant propagation step.

  To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory

  Added option --vardir=<directory> for feature bug#10096