mariadb/netware/BUILD
unknown 75ed6f1a3b Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_time.h:
  manual merge.
mysql-test/mysql-test-run.pl:
  manual merge.
mysql-test/r/ps.result:
  manual merge.
mysql-test/t/disabled.def:
  manual merge.
mysql-test/t/ps.test:
  manual merge.
2006-11-02 17:51:59 -05:00
..
apply-patch Created small scripts to manage in-tree diffs for 2003-10-15 19:50:47 -04:00
compile-AUTOTOOLS Various tool fixes, necessary to build 5.1.12-beta on Netware. 2006-10-12 18:25:27 +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 Temporary fixes for building from source dist in pushbuild 2006-10-24 11:16:53 +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 Various tool fixes, necessary to build 5.1.12-beta on Netware. 2006-10-12 18:25:27 +02: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 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-02 17:51:59 -05:00
mwldnlm Replace all refernces to .la libraries with direct references 2006-10-24 13:12:34 +02:00
nwbootstrap Various tool fixes, necessary to build 5.1.12-beta on Netware. 2006-10-12 18:25:27 +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