Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1

into  mysql.com:/home/alexi/dev/mysql-4.1-innobase

innobase/btr/makefilewin

-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

innobase/buf/makefilewin

-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
-
-
-
-

innobase/data/makefilewin

-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
-

innobase/dict/makefilewin

-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
-
-

innobase/dyn/makefilewin

-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
-
-

innobase/eval/makefilewin

-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

innobase/fil/makefilewin

-include ..\include\makefile.i
-
-fil.lib: fil0fil.obj
-	lib -out:..\libs\fil.lib fil0fil.obj
-
-fil0fil.obj: fil0fil.c
-	$(CCOM) $(CFL) -c fil0fil.c
-
-
-

innobase/fsp/makefilewin

-include ..\include\makefile.i
-
-fsp.lib: fsp0fsp.obj
-	lib -out:..\libs\fsp.lib fsp0fsp.obj
-
-fsp0fsp.obj: fsp0fsp.c
-	$(CCOM) $(CFL) -c fsp0fsp.c
-
-

innobase/fut/makefilewin

-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
-
-

innobase/ha/makefilewin

-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

innobase/ibuf/makefilewin

-include ..\include\makefile.i
-
-ibuf.lib: ibuf0ibuf.obj
-	lib -out:..\libs\ibuf.lib ibuf0ibuf.obj
-
-ibuf0ibuf.obj: ibuf0ibuf.c
-	$(CCOM) $(CFL) -c ibuf0ibuf.c

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 \

innobase/include/makefilewin.i

-# 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 =

innobase/lock/makefilewin

-include ..\include\makefile.i
-
-lock.lib: lock0lock.obj
-	lib -out:..\libs\lock.lib lock0lock.obj
-
-lock0lock.obj: lock0lock.c
-	$(CCOM) $(CFL) -c lock0lock.c

innobase/log/makefilewin

-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

innobase/mach/makefilewin

-include ..\include\makefile.i
-
-mach.lib: mach0data.obj
-	lib -out:..\libs\mach.lib mach0data.obj
-
-mach0data.obj: mach0data.c
-	$(CCOM) $(CFLN) -c mach0data.c
-
-

innobase/makefilewin

-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 ..

innobase/mem/makefilewin

-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

innobase/mtr/makefilewin

-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
-
-
-
-

innobase/my_cnf

-# 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

innobase/os/makefilewin

-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
-

innobase/page/makefilewin

-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
-
-

innobase/pars/makefilewin

-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
-

innobase/que/makefilewin

-include ..\include\makefile.i
-
-que.lib: que0que.obj
-	lib -out:..\libs\que.lib que0que.obj
-
-que0que.obj: que0que.c
-	$(CCOM) $(CFL) -c que0que.c

innobase/read/makefilewin

-include ..\include\makefile.i
-
-read.lib: read0read.obj
-	lib -out:..\libs\read.lib read0read.obj
-
-read0read.obj: read0read.c
-	$(CCOM) $(CFL) -c read0read.c

innobase/rem/makefilewin

-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
-
-

innobase/row/makefilewin

-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

innobase/srv/makefilewin

-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
-
-

innobase/sync/makefilewin

-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
-

innobase/thr/makefilewin

-include ..\include\makefile.i
-
-thr.lib: thr0loc.obj
-	lib -out:..\libs\thr.lib thr0loc.obj
-
-thr0loc.obj: thr0loc.c
-	$(CCOM) $(CFL) -c thr0loc.c
-
-

innobase/trx/makefilewin

-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
-

innobase/usr/makefilewin

-include ..\include\makefile.i
-
-usr.lib: usr0sess.obj
-	lib -out:..\libs\usr.lib usr0sess.obj
-
-usr0sess.obj: usr0sess.c
-	$(CCOM) $(CFL) -c usr0sess.c

innobase/ut/makefilewin

-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
-
-