mariadb/VC++Files
unknown 0fa5279543 merge with 4.0.15
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
SSL/cacert.pem:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
isam/_search.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/r/packet.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
vio/Makefile.am:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/t/myisam.test:
  merge with 4.0.15
  Extra tests
mysys/mf_keycache.c:
  Keep local file
2003-08-29 13:44:35 +03:00
..
bdb Merge with 4.0 2003-03-16 19:17:54 +02:00
client merge with 4.0.15 2003-08-29 13:44:35 +03:00
comp_err Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03: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.15 2003-08-29 13:44:35 +03:00
InstallShield Merge with 3.23 tree to get latest bug fixes 2003-07-01 15:02:16 +03: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.15 2003-08-29 13:44:35 +03:00
libmysqld merge with 4.0.15 2003-08-29 13:44:35 +03:00
libmysqltest Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
merge LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
my_print_defaults Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
myisam Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
myisamchk LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
myisamlog Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
myisammrg LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
myisampack LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +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 merge with 4.0.15 2003-08-29 13:44:35 +03:00
mysqlserver Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
mysqlshutdown Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +03:00
mysqlwatch LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
mysys merge with 4.0.15 2003-08-29 13:44:35 +03: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.15 2003-08-29 13:44:35 +03:00
strings Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading 2003-04-16 11:49:52 -07: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 Update of VC++ project files (to remove link warnings) 2003-08-25 14:27:32 +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.15 2003-08-29 13:44:35 +03:00
prepare additions for compiling for Win via samba 2002-10-08 16:55:39 +05:00