Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


heap/_check.c:
  Auto merged
heap/hp_create.c:
  Auto merged
include/config-netware.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_handler.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/include/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/structs.h:
  Auto merged
strings/conf_to_src.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
Makefile.am:
  Merged from 4.1
myisam/myisamchk.c:
  Merged from 4.1
mysql-test/mysql-test-run.pl:
  Merged from 4.1
mysql-test/r/insert_select.result:
  Merged from 4.1
mysql-test/r/myisam.result:
  Merged from 4.1
mysql-test/r/select.result:
  Merged from 4.1
mysql-test/t/insert_select.test:
  Merged from 4.1
mysql-test/t/myisam.test:
  Merged from 4.1
netware/mysql_test_run.c:
  Merged from 4.1
sql/item.cc:
  Merged from 4.1
sql/mysqld.cc:
  Merged from 4.1
sql/sql_update.cc:
  Merged from 4.1
tests/mysql_client_test.c:
  Merged from 4.1

33 files changed, 1 insertions, 654 deletions

diff --git a/innobase/btr/makefilewin b/innobase/btr/makefilewin
deleted file mode 100644
index a5806b74a51..00000000000
--- a/innobase/btr/makefilewin
+++ /dev/null
@@ -1,16 +0,0 @@
-include ..\include\makefile.i
-
-btr.lib: btr0cur.obj btr0btr.obj btr0pcur.obj btr0sea.obj
-	lib -out:..\libs\btr.lib btr0cur.obj btr0btr.obj btr0pcur.obj btr0sea.obj
-	
-btr0cur.obj: btr0cur.c
-	$(CCOM) $(CFL) -c btr0cur.c
-
-btr0btr.obj: btr0btr.c
-	$(CCOM) $(CFL) -c btr0btr.c
-
-btr0sea.obj: btr0sea.c
-	$(CCOM) $(CFL) -c btr0sea.c
-
-btr0pcur.obj: btr0pcur.c
-	$(CCOM) $(CFL) -c btr0pcur.c
diff --git a/innobase/buf/makefilewin b/innobase/buf/makefilewin
deleted file mode 100644
index ce62cb95958..00000000000
--- a/innobase/buf/makefilewin
+++ /dev/null
@@ -1,20 +0,0 @@
-include ..\include\makefile.i
-
-buf.lib: buf0buf.obj buf0lru.obj buf0flu.obj buf0rea.obj
-	lib -out:..\libs\buf.lib buf0buf.obj buf0lru.obj buf0flu.obj buf0rea.obj
-
-buf0buf.obj: buf0buf.c
-	$(CCOM) $(CFL) -c buf0buf.c
-
-buf0lru.obj: buf0lru.c
-	$(CCOM) $(CFL) -c buf0lru.c
-
-buf0flu.obj: buf0flu.c
-	$(CCOM) $(CFL) -c buf0flu.c
-
-buf0rea.obj: buf0rea.c
-	$(CCOM) $(CFL) -c buf0rea.c
-
-
-
-
diff --git a/innobase/data/makefilewin b/innobase/data/makefilewin
deleted file mode 100644
index 785b75fbb2b..00000000000
--- a/innobase/data/makefilewin
+++ /dev/null
@@ -1,11 +0,0 @@
-include ..\include\makefile.i
-
-data.lib: data0type.obj data0data.obj
-	lib -out:..\libs\data.lib data0type.obj data0data.obj
-
-data0type.obj: data0type.c
-	$(CCOM) $(CFL) -c data0type.c
-
-data0data.obj: data0data.c
-	$(CCOM) $(CFL) -c data0data.c
-
diff --git a/innobase/dict/makefilewin b/innobase/dict/makefilewin
deleted file mode 100644
index e828d06943c..00000000000
--- a/innobase/dict/makefilewin
+++ /dev/null
@@ -1,21 +0,0 @@
-include ..\include\makefile.i
-
-dict.lib: dict0dict.obj dict0boot.obj dict0load.obj dict0mem.obj dict0crea.obj 
-	lib -out:..\libs\dict.lib dict0dict.obj dict0boot.obj dict0load.obj dict0mem.obj dict0crea.obj 
-
-dict0dict.obj: dict0dict.c
-	$(CCOM) $(CFL) -c dict0dict.c
-
-dict0boot.obj: dict0boot.c
-	$(CCOM) $(CFL) -c dict0boot.c
-
-dict0mem.obj: dict0mem.c
-	$(CCOM) $(CFL) -c dict0mem.c
-
-dict0crea.obj: dict0crea.c
-	$(CCOM) $(CFL) -c dict0crea.c
-
-dict0load.obj: dict0load.c
-	$(CCOM) $(CFL) -c dict0load.c
-
-
diff --git a/innobase/dyn/makefilewin b/innobase/dyn/makefilewin
deleted file mode 100644
index 71a58a756c1..00000000000
--- a/innobase/dyn/makefilewin
+++ /dev/null
@@ -1,9 +0,0 @@
-include ..\include\makefile.i
-
-dyn.lib: dyn0dyn.obj makefile
-	lib -out:..\libs\dyn.lib dyn0dyn.obj
-
-dyn0dyn.obj: dyn0dyn.c
-	$(CCOM) $(CFL) -c dyn0dyn.c
-
-
diff --git a/innobase/eval/makefilewin b/innobase/eval/makefilewin
deleted file mode 100644
index f587f2a05a6..00000000000
--- a/innobase/eval/makefilewin
+++ /dev/null
@@ -1,10 +0,0 @@
-include ..\include\makefile.i
-
-eval.lib: eval0eval.obj eval0proc.obj
-	lib -out:..\libs\eval.lib eval0eval.obj eval0proc.obj
-
-eval0eval.obj: eval0eval.c
-	$(CCOM) $(CFL) -c eval0eval.c
-
-eval0proc.obj: eval0proc.c
-	$(CCOM) $(CFL) -c eval0proc.c
diff --git a/innobase/fil/makefilewin b/innobase/fil/makefilewin
deleted file mode 100644
index 1b2d6ab2dbb..00000000000
--- a/innobase/fil/makefilewin
+++ /dev/null
@@ -1,10 +0,0 @@
-include ..\include\makefile.i
-
-fil.lib: fil0fil.obj
-	lib -out:..\libs\fil.lib fil0fil.obj
-
-fil0fil.obj: fil0fil.c
-	$(CCOM) $(CFL) -c fil0fil.c
-
-
-
diff --git a/innobase/fsp/makefilewin b/innobase/fsp/makefilewin
deleted file mode 100644
index 503cf27f490..00000000000
--- a/innobase/fsp/makefilewin
+++ /dev/null
@@ -1,9 +0,0 @@
-include ..\include\makefile.i
-
-fsp.lib: fsp0fsp.obj
-	lib -out:..\libs\fsp.lib fsp0fsp.obj
-
-fsp0fsp.obj: fsp0fsp.c
-	$(CCOM) $(CFL) -c fsp0fsp.c
-
-
diff --git a/innobase/fut/makefilewin b/innobase/fut/makefilewin
deleted file mode 100644
index 40f3161015c..00000000000
--- a/innobase/fut/makefilewin
+++ /dev/null
@@ -1,12 +0,0 @@
-include ..\include\makefile.i
-
-fut.lib: fut0lst.obj fut0fut.obj
-	lib -out:..\libs\fut.lib fut0lst.obj fut0fut.obj
-
-fut0lst.obj: fut0lst.c
-	$(CCOM) $(CFL) -c fut0lst.c
-
-fut0fut.obj: fut0fut.c
-	$(CCOM) $(CFL) -c fut0fut.c
-
-
diff --git a/innobase/ha/makefilewin b/innobase/ha/makefilewin
deleted file mode 100644
index c7cd130ceea..00000000000
--- a/innobase/ha/makefilewin
+++ /dev/null
@@ -1,10 +0,0 @@
-include ..\include\makefile.i
-
-ha.lib: ha0ha.obj hash0hash.obj
-	lib -out:..\libs\ha.lib ha0ha.obj hash0hash.obj
-
-ha0ha.obj: ha0ha.c
-	$(CCOM) $(CFL) -c ha0ha.c
-
-hash0hash.obj: hash0hash.c
-	$(CCOM) $(CFL) -c hash0hash.c
diff --git a/innobase/ibuf/makefilewin b/innobase/ibuf/makefilewin
deleted file mode 100644
index 86bf9794520..00000000000
--- a/innobase/ibuf/makefilewin
+++ /dev/null
@@ -1,7 +0,0 @@
-include ..\include\makefile.i
-
-ibuf.lib: ibuf0ibuf.obj
-	lib -out:..\libs\ibuf.lib ibuf0ibuf.obj
-
-ibuf0ibuf.obj: ibuf0ibuf.c
-	$(CCOM) $(CFL) -c ibuf0ibuf.c
diff --git a/innobase/include/Makefile.am b/innobase/include/Makefile.am
index eb1e3b72877..b83aee06680 100644
--- a/innobase/include/Makefile.am
+++ b/innobase/include/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = btr0btr.h btr0btr.ic btr0cur.h btr0cur.ic \
         ha0ha.h ha0ha.ic hash0hash.h hash0hash.ic \
         ibuf0ibuf.h ibuf0ibuf.ic ibuf0types.h lock0lock.h \
         lock0lock.ic lock0types.h log0log.h log0log.ic log0recv.h \
-        log0recv.ic mach0data.h mach0data.ic makefilewin.i \
+        log0recv.ic mach0data.h mach0data.ic \
         mem0dbg.h mem0dbg.ic mem0mem.h mem0mem.ic mem0pool.h \
         mem0pool.ic mtr0log.h mtr0log.ic mtr0mtr.h mtr0mtr.ic \
         mtr0types.h os0file.h os0proc.h os0proc.ic \
diff --git a/innobase/include/makefilewin.i b/innobase/include/makefilewin.i
deleted file mode 100644
index f756cf2ea3a..00000000000
--- a/innobase/include/makefilewin.i
+++ /dev/null
@@ -1,34 +0,0 @@
-# File included in all makefiles of the database
-# (c) Innobase Oy 1995 - 2000
-
-CCOM=cl
-
-# Flags for the debug version
-#CFL= -MTd -Za -Zi -W4 -WX -F8192 -D "WIN32"
-#CFLN = -MTd -Zi -W4 -F8192 -D "WIN32"
-#CFLW = -MTd -Zi -W3 -WX -F8192 -D "WIN32"
-#LFL =
-
-# Flags for the fast version
-#CFL= -MT -Zi -Og -O2 -W3 -WX -D "WIN32"
-#CFLN = -MT -Zi -Og -O2 -W3 -D "WIN32"
-#CFLW = -MT -Zi -Og -O2 -W3 -WX -D "WIN32"
-#LFL =
-
-# Flags for the fast debug version
-CFL= -MTd -Zi -W3 -WX -F8192 -D "WIN32"
-CFLN = -MTd -Zi -W3 -F8192 -D "WIN32"
-CFLW = -MTd -Zi -W3 -WX -F8192 -D "WIN32"
-LFL = /link/NODEFAULTLIB:LIBCMT
-
-# Flags for the profiler version
-#CFL= -MT -Zi -Og -O2 -W3 -WX -D "WIN32"
-#CFLN = -MT -Zi -Og -O2 -WX -D "WIN32"
-#CFLW = -MT -Zi -Og -O2 -W3 -WX -D "WIN32"
-#LFL= -link -PROFILE
-
-# Flags for the fast version without debug info (= the production version)
-#CFL= -MT -Og -O2 -G6 -W3 -WX -D "WIN32"
-#CFLN = -MT -Og -O2 -G6 -W3 -D "WIN32"
-#CFLW = -MT -Og -O2 -G6 -W3 -WX -D "WIN32"
-#LFL =
diff --git a/innobase/lock/makefilewin b/innobase/lock/makefilewin
deleted file mode 100644
index 149b0a2fed6..00000000000
--- a/innobase/lock/makefilewin
+++ /dev/null
@@ -1,7 +0,0 @@
-include ..\include\makefile.i
-
-lock.lib: lock0lock.obj
-	lib -out:..\libs\lock.lib lock0lock.obj
-
-lock0lock.obj: lock0lock.c
-	$(CCOM) $(CFL) -c lock0lock.c
diff --git a/innobase/log/makefilewin b/innobase/log/makefilewin
deleted file mode 100644
index a690af3bb35..00000000000
--- a/innobase/log/makefilewin
+++ /dev/null
@@ -1,10 +0,0 @@
-include ..\include\makefile.i
-
-log.lib: log0log.obj log0recv.obj
-	lib -out:..\libs\log.lib log0log.obj log0recv.obj
-
-log0log.obj: log0log.c
-	$(CCOM) $(CFL) -c log0log.c
-
-log0recv.obj: log0recv.c
-	$(CCOM) $(CFL) -c log0recv.c
diff --git a/innobase/mach/makefilewin b/innobase/mach/makefilewin
deleted file mode 100644
index 5306b0fe14c..00000000000
--- a/innobase/mach/makefilewin
+++ /dev/null
@@ -1,9 +0,0 @@
-include ..\include\makefile.i
-
-mach.lib: mach0data.obj
-	lib -out:..\libs\mach.lib mach0data.obj
-
-mach0data.obj: mach0data.c
-	$(CCOM) $(CFLN) -c mach0data.c
-
-
diff --git a/innobase/makefilewin b/innobase/makefilewin
deleted file mode 100644
index 1bd8d96e5e7..00000000000
--- a/innobase/makefilewin
+++ /dev/null
@@ -1,164 +0,0 @@
-doall: del_libs pb_all os.lib ut.lib mach.lib sync.lib mem.lib dyn.lib ha.lib com.lib thr.lib srv.lib fil.lib buf.lib log.lib mtr.lib log.lib fut.lib fsp.lib dict.lib data.lib rem.lib page.lib btr.lib ibuf.lib usr.lib que.lib trx.lib lock.lib read.lib row.lib pars.lib eval.lib ib_odbc.lib
-
-del_libs:
-	cd libs
-	del *.lib
-	cd ..
-
-pb_all:
-	pb_all
-	
-os.lib:
-	cd os
-	remake
-	cd ..
-
-ut.lib:
-	cd ut
-	remake
-	cd ..
-
-mach.lib:
-	cd mach
-	remake
-	cd ..
-
-sync.lib:
-	cd sync
-	remake
-	cd ..
-
-mem.lib:
-	cd mem
-	remake
-	cd ..
-
-dyn.lib:
-	cd dyn
-	remake
-	cd ..
-
-ha.lib:
-	cd ha
-	remake
-	cd ..
-
-com.lib:
-	cd com
-	remake
-	cd ..
-
-thr.lib:
-	cd thr
-	remake
-	cd ..
-
-srv.lib:
-	cd srv
-	remake
-	cd ..
-
-fil.lib:
-	cd fil
-	remake
-	cd ..
-
-buf.lib:
-	cd buf
-	remake
-	cd ..
-
-log.lib:
-	cd log
-	remake
-	cd ..
-
-mtr.lib:
-	cd mtr
-	remake
-	cd ..
-
-fut.lib:
-	cd fut
-	remake
-	cd ..
-
-fsp.lib:
-	cd fsp
-	remake
-	cd ..
-
-dict.lib:
-	cd dict
-	remake
-	cd ..
-
-data.lib:
-	cd data
-	remake
-	cd ..
-
-rem.lib:
-	cd rem
-	remake
-	cd ..
-
-page.lib:
-	cd page
-	remake
-	cd ..
-
-btr.lib:
-	cd btr
-	remake
-	cd ..
-
-ibuf.lib:
-	cd ibuf
-	remake
-	cd ..
-
-usr.lib:
-	cd usr
-	remake
-	cd ..
-
-que.lib:
-	cd que
-	remake
-	cd ..
-
-trx.lib:
-	cd trx
-	remake
-	cd ..
-
-lock.lib:
-	cd lock
-	remake
-	cd ..
-
-read.lib:
-	cd read
-	remake
-	cd ..
-
-row.lib:
-	cd row
-	remake
-	cd ..
-
-pars.lib:
-	cd pars
-	remake
-	cd ..
-
-eval.lib:
-	cd eval
-	remake
-	cd ..
-
-ib_odbc.lib:
-	cd odbc
-	remake
-	cd ..
diff --git a/innobase/mem/makefilewin b/innobase/mem/makefilewin
deleted file mode 100644
index 8a30f8a6e71..00000000000
--- a/innobase/mem/makefilewin
+++ /dev/null
@@ -1,10 +0,0 @@
-include ..\include\makefile.i
-
-mem.lib: mem0mem.obj mem0pool.obj makefile
-	lib -out:..\libs\mem.lib mem0mem.obj mem0pool.obj
-
-mem0mem.obj: mem0mem.c mem0dbg.c
-	$(CCOM) $(CFL) -c mem0mem.c
-
-mem0pool.obj: mem0pool.c
-	$(CCOM) $(CFL) -c mem0pool.c
diff --git a/innobase/mtr/makefilewin b/innobase/mtr/makefilewin
deleted file mode 100644
index 9da0863bd28..00000000000
--- a/innobase/mtr/makefilewin
+++ /dev/null
@@ -1,14 +0,0 @@
-include ..\include\makefile.i
-
-mtr.lib: mtr0mtr.obj mtr0log.obj
-	lib -out:..\libs\mtr.lib mtr0mtr.obj mtr0log.obj
-
-mtr0mtr.obj: mtr0mtr.c
-	$(CCOM) $(CFL) -c mtr0mtr.c
-
-mtr0log.obj: mtr0log.c
-	$(CCOM) $(CFL) -c mtr0log.c
-
-
-
-
diff --git a/innobase/my_cnf b/innobase/my_cnf
deleted file mode 100644
index 94365237841..00000000000
--- a/innobase/my_cnf
+++ /dev/null
@@ -1,63 +0,0 @@
-# Example mysql config file.
-# Copy this file to c:\my.cnf to set global options
-# 
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of available options
-
-# This will be passed to all mysql clients
-[client]
-#password=my_password
-port=3306
-#socket=MySQL
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# The MySQL server
-[mysqld]
-port=3306
-#socket=MySQL
-skip-locking
-default-character-set=latin1
-set-variable = key_buffer=2M
-set-variable = max_allowed_packet=1M
-set-variable = thread_stack=128K
-set-variable = flush_time=1800
-
-innobase_data_home_dir = e:\ibdata\
-innobase_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M
-set-variable = innobase_mirrored_log_groups=1
-innobase_log_group_home_dir = e:\iblogs\
-set-variable = innobase_log_files_in_group=3
-set-variable = innobase_log_file_size=5M
-set-variable = innobase_log_buffer_size=8M
-innobase_flush_log_at_trx_commit=1
-innobase_log_arch_dir = e:\iblogs\
-innobase_log_archive=0
-set-variable = innobase_buffer_pool_size=16M
-set-variable = innobase_additional_mem_pool_size=2M
-set-variable = innobase_file_io_threads=4
-set-variable = innobase_lock_wait_timeout=50
-
-
-# Uncomment the following row if you move the MySQL distribution to another
-# location
-#basedir = d:/mysql/
-
-[mysqldump]
-quick
-set-variable = max_allowed_packet=16M
-
-[mysql]
-no-auto-rehash
-
-[isamchk]
-set-variable= key=16M
-
-[client_fltk]
-help_file= c:\mysql\sql_client\MySQL.help
-client_file= c:\mysql\MySQL.options
-history_length=20
-database = test
-queries_root= c:\mysql\queries
-last_database_file= c:\mysql\lastdb
diff --git a/innobase/os/makefilewin b/innobase/os/makefilewin
deleted file mode 100644
index 8bc8d08611b..00000000000
--- a/innobase/os/makefilewin
+++ /dev/null
@@ -1,17 +0,0 @@
-include ..\include\makefile.i
-
-os.lib: os0sync.obj os0thread.obj os0proc.obj os0file.obj
-	lib -out:..\libs\os.lib os0sync.obj os0thread.obj os0proc.obj os0file.obj
-
-os0sync.obj: os0sync.c
-	$(CCOM) $(CFLW) -c os0sync.c
-
-os0thread.obj: os0thread.c
-	$(CCOM) $(CFLW) -c os0thread.c
-
-os0proc.obj: os0proc.c
-	$(CCOM) $(CFLW) -c os0proc.c
-
-os0file.obj: os0file.c
-	$(CCOM) $(CFLW) -c os0file.c
-
diff --git a/innobase/page/makefilewin b/innobase/page/makefilewin
deleted file mode 100644
index 4a132cf828c..00000000000
--- a/innobase/page/makefilewin
+++ /dev/null
@@ -1,12 +0,0 @@
-include ..\include\makefile.i
-
-page.lib: page0page.obj page0cur.obj
-	lib -out:..\libs\page.lib page0page.obj page0cur.obj
-
-page0page.obj: page0page.c
-	$(CCOM) $(CFL) -c page0page.c
-
-page0cur.obj: page0cur.c
-	$(CCOM) $(CFL) -c page0cur.c
-
-
diff --git a/innobase/pars/makefilewin b/innobase/pars/makefilewin
deleted file mode 100644
index f183d89cbe2..00000000000
--- a/innobase/pars/makefilewin
+++ /dev/null
@@ -1,26 +0,0 @@
-include ..\include\makefile.i
-
-pars.lib: pars0grm.obj lexyy.obj pars0pars.obj pars0opt.obj pars0sym.obj rename_and_copy
-	lib -out:..\libs\pars.lib pars0grm.obj lexyy.obj pars0pars.obj pars0opt.obj pars0sym.obj
-
-pars0grm.obj: pars0grm.y
-	bs pars0grm.y
-	$(CCOM) $(CFLW) -c pars0grm.c
-
-rename_and_copy:
-	ren pars0grm.h pars0grm.h
-	copy pars0grm.h ..\include
-	
-lexyy.obj: pars0lex.l
-	fl pars0lex.l
-	$(CCOM) $(CFLN) -c lexyy.c
-
-pars0pars.obj: pars0pars.c
-	$(CCOM) $(CFL) -c pars0pars.c
-
-pars0opt.obj: pars0opt.c
-	$(CCOM) $(CFL) -c pars0opt.c
-
-pars0sym.obj: pars0sym.c
-	$(CCOM) $(CFL) -c pars0sym.c
-
diff --git a/innobase/que/makefilewin b/innobase/que/makefilewin
deleted file mode 100644
index 9661c716551..00000000000
--- a/innobase/que/makefilewin
+++ /dev/null
@@ -1,7 +0,0 @@
-include ..\include\makefile.i
-
-que.lib: que0que.obj
-	lib -out:..\libs\que.lib que0que.obj
-
-que0que.obj: que0que.c
-	$(CCOM) $(CFL) -c que0que.c
diff --git a/innobase/read/makefilewin b/innobase/read/makefilewin
deleted file mode 100644
index 39593993a67..00000000000
--- a/innobase/read/makefilewin
+++ /dev/null
@@ -1,7 +0,0 @@
-include ..\include\makefile.i
-
-read.lib: read0read.obj
-	lib -out:..\libs\read.lib read0read.obj
-
-read0read.obj: read0read.c
-	$(CCOM) $(CFL) -c read0read.c
diff --git a/innobase/rem/makefilewin b/innobase/rem/makefilewin
deleted file mode 100644
index 51ca4a92012..00000000000
--- a/innobase/rem/makefilewin
+++ /dev/null
@@ -1,12 +0,0 @@
-include ..\include\makefile.i
-
-rem.lib: rem0rec.obj rem0cmp.obj
-	lib -out:..\libs\rem.lib rem0rec.obj rem0cmp.obj
-
-rem0rec.obj: rem0rec.c
-	$(CCOM) $(CFL) -c rem0rec.c
-
-rem0cmp.obj: rem0cmp.c
-	$(CCOM) $(CFL) -c rem0cmp.c
-
-
diff --git a/innobase/row/makefilewin b/innobase/row/makefilewin
deleted file mode 100644
index c17240c6119..00000000000
--- a/innobase/row/makefilewin
+++ /dev/null
@@ -1,34 +0,0 @@
-include ..\include\makefile.i
-
-row.lib: row0mysql.obj row0upd.obj row0sel.obj row0umod.obj row0uins.obj row0ins.obj row0upd.obj row0undo.obj row0purge.obj row0vers.obj row0row.obj
-	lib -out:..\libs\row.lib row0mysql.obj row0sel.obj row0umod.obj row0uins.obj row0ins.obj row0upd.obj row0undo.obj row0purge.obj row0vers.obj row0row.obj
-
-row0mysql.obj: row0mysql.c
-	$(CCOM) $(CFL) -c row0mysql.c
-
-row0ins.obj: row0ins.c
-	$(CCOM) $(CFL) -c row0ins.c
-
-row0sel.obj: row0sel.c
-	$(CCOM) $(CFL) -c row0sel.c
-
-row0upd.obj: row0upd.c
-	$(CCOM) $(CFL) -c row0upd.c
-
-row0undo.obj: row0undo.c
-	$(CCOM) $(CFL) -c row0undo.c
-
-row0purge.obj: row0purge.c
-	$(CCOM) $(CFL) -c row0purge.c
-
-row0row.obj: row0row.c
-	$(CCOM) $(CFL) -c row0row.c
-
-row0vers.obj: row0vers.c
-	$(CCOM) $(CFL) -c row0vers.c
-
-row0umod.obj: row0umod.c
-	$(CCOM) $(CFL) -c row0umod.c
-
-row0uins.obj: row0uins.c
-	$(CCOM) $(CFL) -c row0uins.c
diff --git a/innobase/srv/makefilewin b/innobase/srv/makefilewin
deleted file mode 100644
index 129c65ec220..00000000000
--- a/innobase/srv/makefilewin
+++ /dev/null
@@ -1,15 +0,0 @@
-include ..\include\makefile.i
-
-srv.lib: srv0srv.obj srv0que.obj srv0start.obj
-	lib -out:..\libs\srv.lib srv0srv.obj srv0que.obj srv0start.obj
-
-srv0srv.obj: srv0srv.c
-	$(CCOM) $(CFL) -c srv0srv.c
-
-srv0que.obj: srv0que.c
-	$(CCOM) $(CFL) -c srv0que.c
-
-srv0start.obj: srv0start.c
-	$(CCOM) $(CFL) -c srv0start.c
-
-
diff --git a/innobase/sync/makefilewin b/innobase/sync/makefilewin
deleted file mode 100644
index 73cff40405a..00000000000
--- a/innobase/sync/makefilewin
+++ /dev/null
@@ -1,14 +0,0 @@
-include ..\include\makefile.i
-
-sync.lib: sync0sync.obj sync0rw.obj sync0arr.obj
-	lib -out:..\libs\sync.lib sync0sync.obj sync0rw.obj sync0arr.obj
-
-sync0sync.obj: sync0sync.c
-	$(CCOM) $(CFLN) -c sync0sync.c
-
-sync0rw.obj: sync0rw.c
-	$(CCOM) $(CFL) -c sync0rw.c
-
-sync0arr.obj: sync0arr.c
-	$(CCOM) $(CFL) -c sync0arr.c
-
diff --git a/innobase/thr/makefilewin b/innobase/thr/makefilewin
deleted file mode 100644
index 3f29ea1d3e3..00000000000
--- a/innobase/thr/makefilewin
+++ /dev/null
@@ -1,9 +0,0 @@
-include ..\include\makefile.i
-
-thr.lib: thr0loc.obj
-	lib -out:..\libs\thr.lib thr0loc.obj
-
-thr0loc.obj: thr0loc.c
-	$(CCOM) $(CFL) -c thr0loc.c
-
-
diff --git a/innobase/trx/makefilewin b/innobase/trx/makefilewin
deleted file mode 100644
index 35588779d66..00000000000
--- a/innobase/trx/makefilewin
+++ /dev/null
@@ -1,26 +0,0 @@
-include ..\include\makefile.i
-
-trx.lib: trx0sys.obj trx0trx.obj trx0rseg.obj trx0undo.obj trx0rec.obj trx0roll.obj trx0purge.obj
-	lib -out:..\libs\trx.lib trx0sys.obj trx0trx.obj trx0rseg.obj trx0undo.obj trx0rec.obj trx0roll.obj trx0purge.obj
-
-trx0trx.obj: trx0trx.c
-	$(CCOM) $(CFL) -c -I.. trx0trx.c
-
-trx0sys.obj: trx0sys.c
-	$(CCOM) $(CFL) -c -I.. trx0sys.c
-
-trx0rseg.obj: trx0rseg.c
-	$(CCOM) $(CFL) -c -I.. trx0rseg.c
-
-trx0undo.obj: trx0undo.c
-	$(CCOM) $(CFL) -c -I.. trx0undo.c
-
-trx0rec.obj: trx0rec.c
-	$(CCOM) $(CFL) -c -I.. trx0rec.c
-
-trx0roll.obj: trx0roll.c
-	$(CCOM) $(CFL) -c -I.. trx0roll.c
-
-trx0purge.obj: trx0purge.c
-	$(CCOM) $(CFL) -c -I.. trx0purge.c
-
diff --git a/innobase/usr/makefilewin b/innobase/usr/makefilewin
deleted file mode 100644
index 66a77275e9b..00000000000
--- a/innobase/usr/makefilewin
+++ /dev/null
@@ -1,7 +0,0 @@
-include ..\include\makefile.i
-
-usr.lib: usr0sess.obj
-	lib -out:..\libs\usr.lib usr0sess.obj
-
-usr0sess.obj: usr0sess.c
-	$(CCOM) $(CFL) -c usr0sess.c
diff --git a/innobase/ut/makefilewin b/innobase/ut/makefilewin
deleted file mode 100644
index 2fda190773b..00000000000
--- a/innobase/ut/makefilewin
+++ /dev/null
@@ -1,21 +0,0 @@
-include ..\include\makefile.i
-
-ut.lib: ut0ut.obj ut0mem.obj ut0byte.obj ut0dbg.obj ut0rnd.obj
-	lib -out:..\libs\ut.lib ut0ut.obj ut0mem.obj ut0byte.obj ut0dbg.obj ut0rnd.obj
-
-ut0ut.obj: ut0ut.c
-	$(CCOM) $(CFL) -c ut0ut.c
-
-ut0mem.obj: ut0mem.c
-	$(CCOM) $(CFL) -c ut0mem.c
-
-ut0byte.obj: ut0byte.c
-	$(CCOM) $(CFL) -c ut0byte.c
-
-ut0dbg.obj: ut0dbg.c
-	$(CCOM) $(CFL) -c ut0dbg.c
-
-ut0rnd.obj: ut0rnd.c
-	$(CCOM) $(CFL) -c ut0rnd.c
-
-