mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 23:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/netware
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
..
BUILD Merge chilla.local:/home/mydev/mysql-5.0-mmerge 2006-07-20 21:28:55 +02:00
comp_err.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
init_db.sql Some fixes for Netware. 2004-12-13 14:19:34 +02:00
install_test_db.ncf Many files: 2003-02-01 00:42:26 +01:00
isamchk.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
isamlog.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
libmysql.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
libmysql.imp Minor Novell supplied changes for 4.1 (inside netware directory) 2004-01-13 01:10:21 -01:00
libmysqlmain.c Many files: 2003-02-01 00:42:26 +01:00
Makefile.am Merge 2006-06-20 11:11:18 +02: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 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-12-13 18:44:20 +02:00
myisam_ftdump.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
myisamchk.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-08-25 12:08:26 +03:00
myisamlog.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
myisampack.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysql.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysql.xdc New XDC file for NetWare pre-emption 2003-03-31 18:09:13 -05:00
mysql_fix_privilege_tables.pl Some fixes for Netware. 2004-12-13 14:19:34 +02:00
mysql_install_db.c mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: 2006-04-03 03:37:43 +02:00
mysql_install_db.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysql_secure_installation.pl Many files: 2003-02-01 00:42:26 +01:00
mysql_test_run.c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
mysql_test_run.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysql_waitpid.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqladmin.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqlbinlog.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqlcheck.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqld.def Applied some patches for Netware. 2004-11-29 18:32:52 +02: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 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqldump.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqlimport.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
mysqlshow.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-08-25 12:08:26 +03:00
mysqlslap.def mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: 2005-12-19 01:12:11 +01:00
mysqltest.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
pack_isam.def Small fixes for Netware. 2005-10-14 08:45:41 +03:00
perror.def Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-13 18:22:00 +02:00
replace.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
resolve_stack_dump.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
resolveip.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
static_init_db.sql Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
test_db.sql Applied a few Netware patches. 2004-09-16 16:24:44 +03:00