Merge with 4.0

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-standard:
  Delete: netware/BUILD/compile-netware-standard
BitKeeper/deleted/.del-mwenv:
  Delete: netware/BUILD/mwenv
BitKeeper/deleted/.del-nwbootstrap:
  Delete: netware/BUILD/nwbootstrap
BitKeeper/deleted/.del-compile-AUTOTOOLS:
  Delete: netware/BUILD/compile-AUTOTOOLS
BitKeeper/deleted/.del-compile-linux-tools:
  Delete: netware/BUILD/compile-linux-tools
BitKeeper/deleted/.del-compile-netware-END:
  Delete: netware/BUILD/compile-netware-END
BitKeeper/deleted/.del-compile-netware-START:
  Delete: netware/BUILD/compile-netware-START
BitKeeper/deleted/.del-compile-netware-all:
  Delete: netware/BUILD/compile-netware-all
BitKeeper/deleted/.del-compile-netware-debug:
  Delete: netware/BUILD/compile-netware-debug
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
  Auto merged
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Auto merged
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
  Auto merged
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
  Auto merged
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Auto merged
Docs/internals.texi:
  Auto merged
VC++Files/bdb/bdb.dsp:
  Auto merged
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Auto merged
VC++Files/bdb/build_win32/db_archive.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_buildall.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_dll.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_dump.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_java.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_load.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_printlog.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_recover.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_stat.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_static.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_static1.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_tcl.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_test.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_verify.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_access.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_env.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_lock.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_access.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_env.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlcheck.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsw:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/contrib/asm386/zlibvc.dsp:
  Auto merged
VC++Files/contrib/asm386/zlibvc.dsw:
  Auto merged
VC++Files/contrib/minizip/zlibvc.dsp:
  Auto merged
VC++Files/contrib/minizip/zlibvc.dsw:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/dbug/dbug.dsw:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/isam/isam.dsw:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsw:
  Auto merged
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/libmysqltest/mytest.dsw:
  Auto merged
VC++Files/merge/merge.dsp:
  Auto merged
VC++Files/merge/merge.dsw:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisamchk/myisamchk.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/myshutdown.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/mysys/mysys.dsw:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/regex/regex.dsp:
  Auto merged
VC++Files/regex/regex.dsw:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/sql/mysqld.dsw:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
VC++Files/sql/old/mysqld.dsw:
  Auto merged
VC++Files/strings/MASM6x/strings.dsp:
  Auto merged
VC++Files/strings/MASM6x/strings.dsw:
  Auto merged
VC++Files/strings/backup/strings.dsp:
  Auto merged
VC++Files/strings/backup/strings.dsw:
  Auto merged
VC++Files/strings/noMASM/strings.dsp:
  Auto merged
VC++Files/strings/noMASM/strings.dsw:
  Auto merged
VC++Files/strings/strings.dsw:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
include/thr_lock.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_like.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/repl_failsafe.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.h:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/t_ctype.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/grant.res:
  Auto merged
vio/viosocket.c:
  Auto merged

1 files changed, 55 insertions, 55 deletions

diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index e068ba8f164..e15d443a3b7 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -7,22 +7,22 @@
 CFG=mysqld - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "mysqld.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "mysqld.mak" CFG="mysqld - Win32 Release"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "mysqld - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 nt" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Max nt" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Max" (based on "Win32 (x86) Console Application")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -167,7 +167,7 @@ LINK32=xilink6.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-max.exe"
 # SUBTRACT LINK32 /debug
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -193,7 +193,7 @@ SOURCE=.\convert.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -213,7 +213,7 @@ SOURCE=.\derror.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -237,7 +237,7 @@ SOURCE=.\field.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -257,7 +257,7 @@ SOURCE=.\field_conv.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -277,7 +277,7 @@ SOURCE=.\filesort.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -329,7 +329,7 @@ SOURCE=.\handler.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -348,7 +348,7 @@ SOURCE=.\hash_filo.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -371,7 +371,7 @@ SOURCE=.\hostname.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -391,7 +391,7 @@ SOURCE=.\init.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -411,7 +411,7 @@ SOURCE=.\item.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -431,7 +431,7 @@ SOURCE=.\item_buff.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -451,7 +451,7 @@ SOURCE=.\item_cmpfunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -481,7 +481,7 @@ SOURCE=.\item_func.cpp
 
 # ADD CPP /I "../zlib"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -505,7 +505,7 @@ SOURCE=.\item_strfunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -529,7 +529,7 @@ SOURCE=.\item_sum.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -548,7 +548,7 @@ SOURCE=.\item_timefunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -568,7 +568,7 @@ SOURCE=.\item_uniq.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -588,7 +588,7 @@ SOURCE=.\key.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -608,7 +608,7 @@ SOURCE=.\lock.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -628,7 +628,7 @@ SOURCE=.\log.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -651,7 +651,7 @@ SOURCE=.\mf_iocache.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -679,7 +679,7 @@ SOURCE=.\mysqld.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -702,7 +702,7 @@ SOURCE=.\nt_servc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -729,7 +729,7 @@ SOURCE=.\opt_range.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -756,7 +756,7 @@ SOURCE=.\password.c
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -776,7 +776,7 @@ SOURCE=.\procedure.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -800,7 +800,7 @@ SOURCE=.\records.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -836,7 +836,7 @@ SOURCE=.\sql_acl.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -860,7 +860,7 @@ SOURCE=.\sql_base.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -884,7 +884,7 @@ SOURCE=.\sql_class.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -912,7 +912,7 @@ SOURCE=.\sql_db.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -932,7 +932,7 @@ SOURCE=.\sql_delete.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -972,7 +972,7 @@ SOURCE=.\sql_insert.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -992,7 +992,7 @@ SOURCE=.\sql_lex.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1012,7 +1012,7 @@ SOURCE=.\sql_list.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1032,7 +1032,7 @@ SOURCE=.\sql_load.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1056,7 +1056,7 @@ SOURCE=.\sql_map.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1076,7 +1076,7 @@ SOURCE=.\sql_parse.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1108,7 +1108,7 @@ SOURCE=.\sql_select.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1128,7 +1128,7 @@ SOURCE=.\sql_show.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1148,7 +1148,7 @@ SOURCE=.\sql_string.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1168,7 +1168,7 @@ SOURCE=.\sql_table.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1188,7 +1188,7 @@ SOURCE=.\sql_test.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1216,7 +1216,7 @@ SOURCE=.\sql_update.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1236,7 +1236,7 @@ SOURCE=.\sql_yacc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1260,7 +1260,7 @@ SOURCE=.\thr_malloc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1280,7 +1280,7 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1304,7 +1304,7 @@ SOURCE=.\unireg.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Target