merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  merge (Use heikki's code)

4 files changed, 158 insertions, 77 deletions

diff --git a/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
index 8a626c56253..b51c37f8db2 100755
--- a/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
@@ -41,31 +41,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll
diff --git a/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
index c54ff378a55..6564512de2c 100755
--- a/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
@@ -43,31 +43,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll
diff --git a/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
index 8a626c56253..b51c37f8db2 100755
--- a/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
@@ -41,31 +41,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll
diff --git a/VC++Files/examples/udf_example/udf_example.def b/VC++Files/examples/udf_example/udf_example.def
index c1cfeea63f8..9764343e5f2 100644
--- a/VC++Files/examples/udf_example/udf_example.def
+++ b/VC++Files/examples/udf_example/udf_example.def
@@ -2,8 +2,17 @@ LIBRARY		MYUDF
 DESCRIPTION	'MySQL Sample for UDF'
 VERSION		1.0
 EXPORTS
-		metaphon
-		myfunc_double
-		myfunc_int
-		sequence
-		avgcost
\ No newline at end of file
+  metaphon_init
+  metaphon_deinit
+  metaphon
+  myfunc_double_init
+  myfunc_double
+  myfunc_int
+  sequence_init
+  sequence_deinit
+  sequence
+  avgcost_init
+  avgcost_deinit
+  avgcost_reset
+  avgcost_add
+  avgcost