Merge bk-internal:/home/bk/mysql-4.1/

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


sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

16 files changed, 71 insertions, 133 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 1f05efb9b08..b0016735d84 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -2,6 +2,7 @@ Administrador@light.
 Administrator@co3064164-a.
 Administrator@co3064164-a.rochd1.qld.optushome.com.au
 Administrator@fred.
+Greg@greg-laptop.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 WAX@sergbook.mysql.com
@@ -121,6 +122,7 @@ salle@geopard.online.bg
 salle@vafla.home
 salle@vafla.online.bg
 sasha@mysql.sashanet.com
+serg@build.mysql.com
 serg@build.mysql2.com
 serg@serg.mylan
 serg@serg.mysql.com
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index 0f94574b3cc..ca7ff2823ec 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -487,6 +487,10 @@ SOURCE=..\strings\strnmov.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\strings\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\strings\strtoll.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index c753b0d8fe7..f6822f0ebc9 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /I "../libmysqld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
 # SUBTRACT CPP /WX /Fr
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -70,7 +70,7 @@ LINK32=xilink6.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
+# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /I "libmysqld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
 # SUBTRACT CPP /Fr
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -263,10 +263,6 @@ SOURCE=..\sql\net_serv.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\sql\opt_ft.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=..\sql\opt_range.cpp

 # End Source File

 # Begin Source File

diff --git a/VC++Files/mysqldemb/mysqldemb.dsp b/VC++Files/mysqldemb/mysqldemb.dsp
index 4a14401ed29..91cd90a65ed 100644
--- a/VC++Files/mysqldemb/mysqldemb.dsp
+++ b/VC++Files/mysqldemb/mysqldemb.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "../zlib" /I "../libmysqld" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x416 /d "NDEBUG"

 # ADD RSC /l 0x416 /d "NDEBUG"

@@ -65,7 +65,7 @@ LIB32=xilink6.exe -lib
 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Z7 /Od /I "../zlib" /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Z7 /Od /I "../zlib" /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "../libmysqld" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x416 /d "_DEBUG"

 # ADD RSC /l 0x416 /d "_DEBUG"

@@ -220,10 +220,6 @@ SOURCE=..\sql\net_serv.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\sql\opt_ft.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=..\sql\opt_range.cpp

 # End Source File

 # Begin Source File

diff --git a/VC++Files/mysqlserver/mysqlserver.dsp b/VC++Files/mysqlserver/mysqlserver.dsp
index d8df71ebbb2..d4f4af454d0 100644
--- a/VC++Files/mysqlserver/mysqlserver.dsp
+++ b/VC++Files/mysqlserver/mysqlserver.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "../libmysqld" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /YX /FD /c
 # ADD BASE RSC /l 0x416 /d "NDEBUG"

 # ADD RSC /l 0x416 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -64,7 +64,7 @@ LIB32=xilink6.exe -lib
 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Z7 /Od /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Z7 /Od /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "libmysqld" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x416 /d "_DEBUG"

 # ADD RSC /l 0x416 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp
index 1f54910bf58..1c5ce5249f5 100644
--- a/VC++Files/strings/MASM6x/strings.dsp
+++ b/VC++Files/strings/MASM6x/strings.dsp
@@ -84,10 +84,6 @@ LIB32=link.exe -lib
 # Name "strings - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\atof.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\bchange.c
 # End Source File
 # Begin Source File
@@ -191,6 +187,10 @@ InputName=Strings
 # End Source File
 # Begin Source File
 
+SOURCE=.\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/strings/noMASM/strings.dsp b/VC++Files/strings/noMASM/strings.dsp
index 6e2dbb3c013..ffec20f3a59 100644
--- a/VC++Files/strings/noMASM/strings.dsp
+++ b/VC++Files/strings/noMASM/strings.dsp
@@ -25,7 +25,7 @@ CFG=strings - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "strings - Win32 Release"
@@ -48,7 +48,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_release\strings.lib"
 
@@ -65,14 +65,14 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
@@ -84,10 +84,6 @@ LIB32=link.exe -lib
 # Name "strings - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\atof.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\bchange.c
 # End Source File
 # Begin Source File
@@ -100,10 +96,6 @@ SOURCE=.\bfill.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\bmove.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\bmove512.c
 # End Source File
 # Begin Source File
@@ -116,6 +108,10 @@ SOURCE=".\ctype-big5.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-bin.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -124,6 +120,10 @@ SOURCE=".\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-extra.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-gb2312.c"
 # End Source File
 # Begin Source File
@@ -132,7 +132,15 @@ SOURCE=".\ctype-gbk.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-latin1_de.c"
+SOURCE=".\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-mb.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-simple.c"
 # End Source File
 # Begin Source File
 
@@ -144,10 +152,22 @@ SOURCE=".\ctype-tis620.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-ucs2.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-ujis.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-win1250ch.c"
+# End Source File
+# Begin Source File
+
 SOURCE=.\ctype.c
 # End Source File
 # Begin Source File
@@ -168,23 +188,23 @@ SOURCE=.\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\r_strinstr.c
+SOURCE=.\my_strtoll10.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\str2int.c
+SOURCE=.\my_vsnprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strappend.c
+SOURCE=.\r_strinstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcend.c
+SOURCE=.\str2int.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcont.c
+SOURCE=.\strcend.c
 # End Source File
 # Begin Source File
 
@@ -196,10 +216,6 @@ SOURCE=.\strfill.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strinstr.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\strmake.c
 # End Source File
 # Begin Source File
@@ -208,15 +224,11 @@ SOURCE=.\strmov.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strnlen.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\strnmov.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strstr.c
+SOURCE=.\strtod.c
 # End Source File
 # Begin Source File
 
@@ -242,5 +254,9 @@ SOURCE=.\strxmov.c
 
 SOURCE=.\strxnmov.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\xml.c
+# End Source File
 # End Target
 # End Project
diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp
index 030acdb7451..ffec20f3a59 100644
--- a/VC++Files/strings/strings.dsp
+++ b/VC++Files/strings/strings.dsp
@@ -84,10 +84,6 @@ LIB32=xilink6.exe -lib
 # Name "strings - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\atof.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\bchange.c
 # End Source File
 # Begin Source File
@@ -232,6 +228,10 @@ SOURCE=.\strnmov.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index ab2e2697359..4e11407ba54 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -1323,66 +1323,6 @@ btr_cur_parse_update_in_place(
 }
 
 /*****************************************************************
-Updates a secondary index record when the update causes no size
-changes in its fields. The only case when this function is currently
-called is that in a char field characters change to others which
-are identified in the collation order. */
-
-ulint
-btr_cur_update_sec_rec_in_place(
-/*============================*/
-				/* out: DB_SUCCESS or error number */
-	btr_cur_t*	cursor,	/* in: cursor on the record to update;
-				cursor stays valid and positioned on the
-				same record */
-	upd_t*		update,	/* in: update vector */
-	que_thr_t*	thr,	/* in: query thread */
-	mtr_t*		mtr)	/* in: mtr */
-{
-	dict_index_t*	index 		= cursor->index;
-	dict_index_t*	clust_index;
-	ulint		err;
-	rec_t*		rec;
-	dulint		roll_ptr	= ut_dulint_zero;
-	trx_t*		trx		= thr_get_trx(thr);
-
-	/* Only secondary index records are updated using this function */
-	ut_ad(0 == (index->type & DICT_CLUSTERED));
-
-	rec = btr_cur_get_rec(cursor);
-	
-	if (btr_cur_print_record_ops && thr) {
-		printf(
-	"Trx with id %lu %lu going to update table %s index %s\n",
-		(unsigned long) ut_dulint_get_high(thr_get_trx(thr)->id),
-		(unsigned long) ut_dulint_get_low(thr_get_trx(thr)->id),
-		index->table_name, index->name);
-		rec_print(rec);
-	}
-
-	err = lock_sec_rec_modify_check_and_lock(0, rec, index, thr);
-
-	if (err != DB_SUCCESS) {
-
-		return(err);
-	}
-
-	/* Remove possible hash index pointer to this record */
-	btr_search_update_hash_on_delete(cursor);
-
-	row_upd_rec_in_place(rec, update);
-
-	clust_index = dict_table_get_first_index(index->table);
-
-	/* Note that roll_ptr is really just a dummy value since
-	a secondary index record does not contain any sys columns */
-
-	btr_cur_update_in_place_log(BTR_KEEP_SYS_FLAG, rec, clust_index,
-						update, trx, roll_ptr, mtr);
-	return(DB_SUCCESS);
-}
-
-/*****************************************************************
 Updates a record when the update causes no size changes in its fields.
 We assume here that the ordering fields of the record do not change. */
 
diff --git a/innobase/configure.in b/innobase/configure.in
index 9d57a0f2d91..741131eb9e2 100644
--- a/innobase/configure.in
+++ b/innobase/configure.in
@@ -117,7 +117,7 @@ AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
 		eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
 		ha/Makefile ibuf/Makefile include/Makefile dnl
 		lock/Makefile log/Makefile dnl
-		mach/Makefile mem/Makefile mtr/Makefile odbc/Makefile dnl
+		mach/Makefile mem/Makefile mtr/Makefile dnl
 		page/Makefile pars/Makefile que/Makefile dnl
 		read/Makefile rem/Makefile row/Makefile dnl
 		srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 581bc54db18..ec5f76409e7 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -1,6 +1,6 @@
 select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.5555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
 format(1.5555,0)	format(123.5555,1)	format(1234.5555,2)	format(12345.5555,3)	format(123456.5555,4)	format(1234567.5555,5)	format("12345.2399",2)
-2	123.6	1,234.56	12,345.555	123,456.5555	1,234,567.55550	12,345.24
+2	123.6	1,234.56	12,345.556	123,456.5555	1,234,567.55550	12,345.24
 select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255"));
 inet_ntoa(inet_aton("255.255.255.255.255.255.255.255"))
 NULL
diff --git a/sql/item.h b/sql/item.h
index b06bc85d573..fb93e0ef8ab 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -252,7 +252,7 @@ public:
   st_select_lex *depended_from;
   Item_ident(const char *db_name_par,const char *table_name_par,
 	     const char *field_name_par);
-  Item_ident::Item_ident(THD *thd, Item_ident *item);
+  Item_ident(THD *thd, Item_ident *item);
   const char *full_name() const;
 
   bool remove_dependence_processor(byte * arg);
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 71754255573..33512eae2cb 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1599,10 +1599,8 @@ String *Item_func_format::val_str(String *str)
   dec= decimals ? decimals+1 : 0;
   /* Here default_charset() is right as this is not an automatic conversion */
   str->set(nr,decimals, default_charset());
-#ifdef HAVE_ISNAN
   if (isnan(nr))
     return str;
-#endif
   str_length=str->length();
   if (nr < 0)
     str_length--;				// Don't count sign
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 07e07e97781..00d21560e75 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5618,7 +5618,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   }
   case OPT_FT_BOOLEAN_SYNTAX:
-    if (ft_boolean_check_syntax_string(argument))
+    if (ft_boolean_check_syntax_string((byte*) argument))
     {
       fprintf(stderr, "Invalid ft-boolean-syntax string: %s\n", argument);
       exit(1);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index f3728ce9e5d..12be0225421 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -860,7 +860,7 @@ static void sys_default_init_slave(THD* thd, enum_var_type type)
 static int sys_check_ftb_syntax(THD *thd,  set_var *var)
 {
   if (thd->master_access & SUPER_ACL)
-    return ft_boolean_check_syntax_string(var->value->str_value.c_ptr()) ?
+    return ft_boolean_check_syntax_string((byte*) var->value->str_value.c_ptr()) ?
       -1 : 0;
   else
   {
diff --git a/strings/strtod.c b/strings/strtod.c
index 5b3be40cbf8..027abe56269 100644
--- a/strings/strtod.c
+++ b/strings/strtod.c
@@ -36,16 +36,6 @@ static double scaler1[] = {
   1.0, 10.0, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9
 };
 
-/* let's use a static array for not to accumulate the error */
-static double pastpoint[] = {
-  1e-1,  1e-2,  1e-3,  1e-4,  1e-5,  1e-6,  1e-7,  1e-8,  1e-9,
-  1e-10, 1e-11, 1e-12, 1e-13, 1e-14, 1e-15, 1e-16, 1e-17, 1e-18,  1e-19,
-  1e-20, 1e-21, 1e-22, 1e-23, 1e-24, 1e-25, 1e-26, 1e-27, 1e-28,  1e-29,
-  1e-30, 1e-31, 1e-32, 1e-33, 1e-34, 1e-35, 1e-36, 1e-37, 1e-38,  1e-39,
-  1e-40, 1e-41, 1e-42, 1e-43, 1e-44, 1e-45, 1e-46, 1e-47, 1e-48,  1e-49,
-  1e-50, 1e-51, 1e-52, 1e-53, 1e-54, 1e-55, 1e-56, 1e-57, 1e-58,  1e-59,
-};
-
 double my_strtod(const char *str, char **end)
 {
   double result= 0.0;
@@ -68,17 +58,13 @@ double my_strtod(const char *str, char **end)
 
   if (*str == '.')
   {
-    int n= 0;
+    double p10=10;
     str++;
     old_str= str;
     while (my_isdigit (&my_charset_latin1, *str))
     {
-      if (n < sizeof(pastpoint)/sizeof(pastpoint[0]))
-      {
-        result+= pastpoint[n] * (*str - '0');
-        n++;
-      }
-      str++;
+      result+= (*str++ - '0')/p10;
+      p10*=10;
     }
     ndigits+= str-old_str;
     if (!ndigits) str--;