mariadb/netware
unknown 24f8b1cfa8 Merging 4.1->5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-src~1:
  Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp~1:
  Delete: netware/BUILD/knetware.imp
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-22 16:10:22 +02:00
..
BUILD Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
comp_err.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
init_db.sql novell41b.patch 2003-03-05 18:52:47 -05:00
install_test_db.ncf Many files: 2003-02-01 00:42:26 +01:00
isamchk.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
isamlog.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
libmysql.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
libmysql.imp Many files: 2003-02-01 00:42:26 +01:00
libmysqlmain.c Many files: 2003-02-01 00:42:26 +01:00
Makefile.am mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows 2003-07-23 01:35:24 -04:00
my_manage.c mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows 2003-07-23 01:35:24 -04:00
my_manage.h mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows 2003-07-23 01:35:24 -04:00
my_print_defaults.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
myisamchk.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
myisamlog.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
myisampack.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysql.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysql.xdc New XDC file for NetWare pre-emption 2003-03-31 18:09:13 -05:00
mysql_fix_privilege_tables.pl novell40b.patch 2003-03-03 23:00:49 -05:00
mysql_install.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysql_install_db.c Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysql_install_db.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysql_secure_installation.pl Many files: 2003-02-01 00:42:26 +01:00
mysql_test_run.c mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows 2003-07-23 01:35:24 -04:00
mysql_test_run.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqladmin.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqlbinlog.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqlcheck.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqld.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqld_safe.c Missed one file from Novell changes in 1.1686 2003-03-21 16:14:52 -05:00
mysqld_safe.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqldump.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqlimport.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqlshow.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
mysqltest.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
pack_isam.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
perror.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
replace.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
resolveip.def Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
static_init_db.sql Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
test_db.sql novell41b.patch 2003-03-05 18:52:47 -05:00