mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 18:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
unknown 2005-10-27 23:43:20 +03:00
commit 7911c50718
74 changed files with 1163 additions and 923 deletions
Download patch file Download diff file Expand all files Collapse all files

2
innobase/include/Makefile.am
View file

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

34
innobase/include/makefilewin.i
View file

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