mariadb/netware/BUILD
unknown 98fd299133 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-collapsed:
  auto-union
BitKeeper/etc/collapsed:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
sql/sql_view.cc:
  Manual merge.
2006-10-17 12:00:36 -04:00
..
apply-patch Created small scripts to manage in-tree diffs for 2003-10-15 19:50:47 -04:00
compile-AUTOTOOLS Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
compile-linux-tools .libs is no longer used when compiling netware 2006-04-03 11:54:09 -04:00
compile-netware-all Added patches from Novell 2004-05-25 22:00:14 +03:00
compile-netware-debug Minor changes in netware directory (From Rob Lyon - Novell) 2003-04-24 18:15:52 -04:00
compile-netware-END Use autorun.sh from BUILD/ instead of netware specific version 2006-10-12 17:55:06 +02:00
compile-netware-max Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-10-12 14:15:17 +02:00
compile-netware-max-debug Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-10-12 14:15:17 +02:00
compile-netware-src Make all compile-netware-* scripts executable 2006-10-12 14:14:54 +02:00
compile-netware-standard Portability fixes (For Netware) 2004-07-01 17:26:45 +03:00
compile-netware-START added option for netware build 2006-03-26 21:23:15 -05:00
create-patch Improve make_binary_distribution from Novell code at Monty's request 2003-03-27 18:13:37 -05:00
cron-build Minor changes in netware directory (From Rob Lyon - Novell) 2003-04-24 18:15:52 -04:00
crontab Minor changes in netware directory (From Rob Lyon - Novell) 2003-04-24 18:15:52 -04:00
knetware.imp Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
mwasmnlm mwldnlm, mwccnlm, mwasmnlm: 2006-07-03 16:44:17 +02:00
mwccnlm Netware changes for build with yaSSL 2006-09-22 17:43:05 +02:00
mwenv 5.1 should use libc-2006 by default 2006-10-12 13:31:41 +02:00
mwldnlm mwldnlm, mwccnlm, mwasmnlm: 2006-07-03 16:44:17 +02:00
nwbootstrap Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
openssl.imp Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
save-patch Created small scripts to manage in-tree diffs for 2003-10-15 19:50:47 -04:00