mariadb/netware
unknown f095274fe8 merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
Docs/Support/texi2html:
  Auto merged
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/include/ps_modify.inc:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/insert.test:
  merge with 4.1
  Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
  merge with 4.1
  Added missing drop table
sql/ha_ndbcluster.cc:
  merge with 4.1
  Simple optimization: use max() instead of ? :
sql/item_func.cc:
  merge with 4.1
  (Added back old variable names for easier merges)
sql/opt_range.cc:
  merge with 4.1
  Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
  Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
  Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
  merge with 4.1
  change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
  Use multi-update code from 5.0 instead of 4.1
  We will fix the locking code shortly in 5.0 to be faster than in 4.1
2004-10-29 19:26:52 +03:00
..
BUILD Portability fixes (For Netware) 2004-07-01 17:26:45 +03: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 Applied a few Netware patches. 2004-09-16 16:24:44 +03:00
install_test_db.ncf Many files: 2003-02-01 00:42:26 +01:00
isamchk.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01: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 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 with 4.0.21 2004-06-18 04:38:58 +03:00
my_manage.c Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
my_manage.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02: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
myisam_ftdump.def Added patches from Novell 2004-05-25 22:00:14 +03:00
myisamchk.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01:00
myisamlog.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01:00
myisampack.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01: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 Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03: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 Added patches from Novell 2004-05-25 22:00:14 +03: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 mysqld.cc, mysql_test_run.c: 2004-08-05 17:05:21 +02: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
mysql_waitpid.def Added patches from Novell 2004-05-25 22:00:14 +03: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 Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01:00
mysqlcheck.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01: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 After merge fixes 2004-06-21 10:21:20 +03: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 Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01:00
mysqlimport.def Checked and applied Novell-supplied patches inside the netware directory only. 2004-01-12 21:15:49 -01: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
resolve_stack_dump.def Added patches from Novell 2004-05-25 22:00:14 +03: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 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