mariadb/VC++Files
unknown c635d37479 Merge 4.1 -> 5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/rpl_flush_log_loop.result:
  Auto merged
mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_s.result:
  Auto merged
mysql-test/r/rpl_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_reset_slave.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/rpl_until.result:
  Auto merged
mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_relayrotate-slave.opt:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged
tests/client_test.c:
  Auto merged
2004-04-07 19:07:44 +02:00
..
bdb Merge with 4.0 2003-03-16 19:17:54 +02:00
client Minor changes to fix Windows project files 2004-03-19 14:43:04 -01: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-25 23:29:45 +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 Changes to project files precipitated from 4.1 test builds. 2004-03-22 14:30:30 -07:00
libmysqld Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02: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 Changes in Windows project files instituted after latest 4.1 test build. 2004-03-21 18:03:34 -07: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 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
strings Merge with 4.0 2004-03-25 23:29:45 +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 Minor changes to fix Windows project files 2004-03-19 14:43:04 -01:00
prepare additions for compiling for Win via samba 2002-10-08 16:55:39 +05:00