mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/VC++Files
History
unknown a8aacf8764 merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/ha/hash0hash.c:
  Auto merged
innobase/include/btr0btr.ic:
  Auto merged
innobase/include/data0type.ic:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/row0upd.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0rseg.ic:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/read/read0read.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/rpl_error_ignored_table.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_pack.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/thread_test.c:
  Auto merged
client/mysqldump.c:
  Keep original indentation
mysql-test/r/merge.result:
  keep old file
scripts/mysql_fix_privilege_tables.sh:
  Keep old structure in merge with 4.0
sql/table.cc:
  merge with 4.0 + simple optimizations
2004-03-16 22:41:30 +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 merge with 4.0 2004-03-16 22:41:30 +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 merge with 4.0 2004-03-16 22:41:30 +02:00
libmysqld Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01: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 Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01: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 Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01: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 Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01: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