mariadb/netware
unknown 5578506302 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged
2007-03-20 17:58:30 +01:00
..
BUILD myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 2006-12-02 04:25:41 +01:00
comp_err.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
install_test_db.ncf Many files: 2003-02-01 00:42:26 +01:00
isamchk.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
isamlog.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
libmysql.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
libmysqlmain.c Many files: 2003-02-01 00:42:26 +01:00
Makefile.am Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-03-20 17:58:30 +01:00
my_manage.c A patch for Netware. 2005-01-13 19:24:54 +02:00
my_manage.h Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
my_print_defaults.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
myisam_ftdump.def myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 2006-12-02 04:25:41 +01:00
myisamchk.def myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 2006-12-02 04:25:41 +01:00
myisamlog.def myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 2006-12-02 04:25:41 +01:00
myisampack.def myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 2006-12-02 04:25:41 +01:00
mysql.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysql.xdc New XDC file for NetWare pre-emption 2003-03-31 18:09:13 -05:00
mysql_client_test.def Makefile.am: 2006-12-02 06:06:31 +01:00
mysql_fix_privilege_tables.pl Many files: 2006-12-23 20:17:15 +01:00
mysql_install_db.c Fixed warning message breakage. 2006-08-13 22:28:41 -07:00
mysql_install_db.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysql_secure_installation.pl Many files: 2006-12-23 20:17:15 +01:00
mysql_test_run.c Fixed warning message breakage. 2006-08-13 22:28:41 -07:00
mysql_test_run.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysql_upgrade.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysql_waitpid.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqladmin.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqlbinlog.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqlcheck.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqld.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqld_safe.c Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2006-01-12 20:28:23 +02:00
mysqld_safe.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqldump.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqlimport.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqlshow.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
mysqlslap.def mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: 2005-12-19 01:12:11 +01:00
mysqltest.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
pack_isam.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
perror.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
replace.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
resolve_stack_dump.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
resolveip.def mysql_upgrade.def Makefile.am: 2006-12-01 23:09:14 +01:00
static_init_db.sql Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00