mariadb/netware
unknown 6b8e2938f2 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
2003-04-03 21:19:12 +03:00
..
BUILD
comp_err.def
init_db.sql
install_test_db.ncf
isamchk.def
isamlog.def
libmysql.def
libmysql.imp
libmysqlmain.c
Makefile.am
my_manage.c
my_manage.h
my_print_defaults.def
myisamchk.def
myisamlog.def
myisampack.def
mysql.def
mysql.xdc
mysql_fix_privilege_tables.pl
mysql_install.def
mysql_install_db.c
mysql_install_db.def
mysql_secure_installation.pl
mysql_test_run.c
mysql_test_run.def
mysqladmin.def
mysqlbinlog.def
mysqlcheck.def
mysqld.def
mysqld_safe.c
mysqld_safe.def
mysqldump.def
mysqlimport.def
mysqlshow.def
mysqltest.def
pack_isam.def
perror.def
replace.def
resolveip.def
test_db.sql