mariadb/VC++Files
unknown f97f48acaf Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-apply-patch:
  Delete: netware/BUILD/apply-patch
BitKeeper/deleted/.del-save-patch:
  Delete: netware/BUILD/save-patch
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
extra/resolveip.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/errors.c:
  Auto merged
mysys/my_symlink.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/unireg.h:
  Auto merged
client/mysqldump.c:
  merge with 4.0 (quoted names)
configure.in:
  use local file
include/my_pthread.h:
  Use local file
innobase/include/srv0srv.h:
  Use local file
innobase/row/row0sel.c:
  Use local file
innobase/srv/srv0srv.c:
  Use local file
libmysql/libmysql.c:
  Use local file
myisam/myisamchk.c:
  merge fixes
mysql-test/r/func_crypt.result:
  update results
mysql-test/r/order_by.result:
  update results
mysql-test/r/query_cache.result:
  update results
mysql-test/r/range.result:
  update results
mysql-test/r/rpl_reset_slave.result:
  update results
mysql-test/r/rpl_trunc_binlog.result:
  update results
mysql-test/t/func_crypt.test:
  Added disable_warnings/enable warnings
mysql-test/t/query_cache.test:
  merge tests
mysql-test/t/range.test:
  merge tests
mysys/charset.c:
  use local file (will merge patch separately)
sql/ha_innodb.cc:
  use local file
sql/log_event.cc:
  new slave_proxy_id handling
sql/slave.h:
  merge
sql/sql_base.cc:
  merge
sql/sql_parse.cc:
  Fixes for counting user connect resourses
  Added function comments for involved functions
sql/sql_select.cc:
  Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
sql/unireg.cc:
  merge fixes
support-files/mysql.server.sh:
  merge fixes
2003-11-04 09:40:36 +02: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 Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 2003-09-15 17:39:50 -04: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.16 2003-10-07 15:42:26 +03:00
libmysqld Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 2003-11-03 14:01:59 +02:00
libmysqltest Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 2003-09-15 17:39:50 -04: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 Identical mysql.ico and MYSQL.ICO 2003-10-14 10:45:03 -05:00
mysqlwatch Merge with 3.23.58 2003-10-06 21:21:04 +03:00
mysys Merge with 4.0 2003-11-04 09:40:36 +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 Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 2003-11-03 14:01:59 +02:00
strings Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 2003-11-03 14:01:59 +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.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