mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/netware/BUILD
History
unknown 05fc3f10c9 Merge chilla.local:/home/mydev/mysql-5.0-mmerge 
into  chilla.local:/home/mydev/mysql-5.1-amain


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Manual merge
include/my_sys.h:
  Manual merge
mysql-test/t/federated.test:
  Manual merge
sql/ha_federated.cc:
  Manual merge
tests/Makefile.am:
  Manual merge
2006-07-20 21:28:55 +02: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 configure.in, net_serv.cc, compile-netware-END: 2006-06-17 00:30:02 +02:00
compile-netware-max Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
compile-netware-max-debug Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
compile-netware-src - cleanup: removed the empty NEW-RPMS directory and all references 2005-10-27 18:32:14 +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 mwldnlm, mwccnlm, mwasmnlm: 2006-07-03 16:44:17 +02:00
mwenv Several Netware specific fixes. 2006-02-02 16:22:31 +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