mariadb/VC++Files
unknown 192bf819eb merge with 4.0
BitKeeper/etc/ignore:
  auto-union
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
acinclude.m4:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/com/com0shm.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0proc.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-02-22 09:50:59 +02:00
..
bdb Merge with 4.0 2003-03-16 19:17:54 +02:00
client After merge fixes 2004-02-22 08:09:32 +02:00
comp_err merge with 4.0 2004-02-22 09:50:59 +02:00
contrib LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
dbug LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
heap LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
innobase Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 2003-11-22 03:21:40 +02:00
InstallShield Fix name conflict with alternate capitalization 2004-02-20 14:42:43 -01:00
isam LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
isamchk Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
libmysql Portability fixes for Windows 2003-12-08 12:25:37 +02:00
libmysqld Fix for #2278 (mysql_prepare and mysql_execute not exported in libmysqld.dll) 2004-01-21 00:08:18 +04:00
libmysqltest Fixed compiler warnings from Intel compiler in Win64 2003-11-23 14:36:41 +02:00
merge LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
my_print_defaults Major work on Windows build automation-- add binary packaging, suffixes 2004-02-19 19:04:47 -01:00
myisam Merge key cache structures to one 2003-11-20 22:06:25 +02:00
myisam_ftdump Major work on Windows build automation-- add binary packaging, suffixes 2004-02-19 19:04:47 -01:00
myisamchk Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 2003-11-22 03:21:40 +02:00
myisamlog Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 2003-11-22 03:21:40 +02:00
myisammrg LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
myisampack merge with 4.0 2004-02-22 09:50:59 +02:00
mysqlbinlog merge with 4.0.15 2003-08-29 13:44:35 +03:00
mysqlcheck Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
mysqldemb merge with 4.0.15 2003-08-29 13:44:35 +03:00
mysqlmanager Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 2003-11-22 03:21:40 +02:00
mysqlserver Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
mysqlshutdown Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 2003-11-22 03:21:40 +02:00
mysqlwatch Merge with 3.23.58 2003-10-06 21:21:04 +03:00
mysys After merge fixes 2004-02-22 08:09:32 +02:00
pack_isam Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
perror Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
regex LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
replace Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
sql merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
strings Portability fixes for Windows 2003-12-08 12:25:37 +02:00
test1 Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
thr_insert_test LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
thr_test Merge with 3.23.58 2003-10-06 21:21:04 +03:00
vio Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
winmysqladmin Updated windows files (VC++ files and winmysqladmin). 2002-06-28 17:26:11 +03:00
zlib Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
fix-project-files Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
mysql.dsp LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
mysql.dsw merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
prepare additions for compiling for Win via samba 2002-10-08 16:55:39 +05:00