mariadb/netware
unknown 4ad51359c1 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)



BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/client_settings.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/func_like.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqlbinlog.cc:
  Merge with 4.1
configure.in:
  Merge with 4.1
include/mysqld_error.h:
  Add new error message (1) from 4.1
mysql-test/mysql-test-run.sh:
  Merge with 4.1
mysql-test/r/func_gconcat.result:
  Merge with 4.1
mysql-test/r/func_if.result:
  Merge with 4.1
mysql-test/r/grant.result:
  Merge with 4.1
mysql-test/r/join_outer.result:
  Merge with 4.1
mysql-test/r/rpl_charset.result:
  Merge with 4.1 (This has to be fixed before pushing)
mysql-test/r/system_mysql_db.result:
  Merge with 4.1.
  Added collation to new privileges
mysql-test/t/grant.test:
  Merge with 4.1
mysql-test/t/grant_cache.test:
  Merge with 4.1
mysql-test/t/show_check.test:
  Merge with 4.1
sql/Makefile.am:
  Merge with 4.1
sql/item.cc:
  Merge with 4.1
sql/item_cmpfunc.cc:
  Merge with 4.1 (arena code)
sql/item_subselect.cc:
  Merge with 4.1
sql/item_subselect.h:
  Merge with 4.1
sql/item_sum.cc:
  Merge with 4.1
sql/item_sum.h:
  Merge with 4.1
sql/log.cc:
  Merge with 4.1 (Remove code that is not relevant for 5.0)
sql/mysqld.cc:
  Merge with 4.1
sql/opt_range.cc:
  Merge with 4.1
sql/share/czech/errmsg.txt:
  Merge with 4.1
sql/share/danish/errmsg.txt:
  Merge with 4.1
sql/share/dutch/errmsg.txt:
  Merge with 4.1
sql/share/english/errmsg.txt:
  Merge with 4.1
sql/share/estonian/errmsg.txt:
  Merge with 4.1
sql/share/french/errmsg.txt:
  Merge with 4.1
sql/share/german/errmsg.txt:
  Merge with 4.1
sql/share/greek/errmsg.txt:
  Merge with 4.1
sql/share/hungarian/errmsg.txt:
  Merge with 4.1
sql/share/italian/errmsg.txt:
  Merge with 4.1
sql/share/japanese/errmsg.txt:
  Merge with 4.1
sql/share/korean/errmsg.txt:
  Merge with 4.1
sql/share/norwegian-ny/errmsg.txt:
  Merge with 4.1
sql/share/norwegian/errmsg.txt:
  Merge with 4.1
sql/share/polish/errmsg.txt:
  Merge with 4.1
sql/share/portuguese/errmsg.txt:
  Merge with 4.1
sql/share/romanian/errmsg.txt:
  Merge with 4.1
sql/share/russian/errmsg.txt:
  Merge with 4.1
sql/share/serbian/errmsg.txt:
  Merge with 4.1
sql/share/slovak/errmsg.txt:
  Merge with 4.1
sql/share/spanish/errmsg.txt:
  Merge with 4.1
sql/share/swedish/errmsg.txt:
  Merge with 4.1
sql/share/ukrainian/errmsg.txt:
  Merge with 4.1
sql/sql_base.cc:
  Merge with 4.1
sql/sql_class.cc:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_class.h:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_derived.cc:
  Merge with 4.1
sql/sql_lex.cc:
  Merge with 4.1
sql/sql_lex.h:
  Merge with 4.1
sql/sql_parse.cc:
  Merge with 4.1
sql/sql_prepare.cc:
  Merge with 4.1
sql/sql_select.cc:
  Merge with 4.1
sql/sql_table.cc:
  Merge with 4.1
sql/sql_union.cc:
  Merge with 4.1
sql/sql_yacc.yy:
  Merge with 4.1
sql/tztime.cc:
  Merge with 4.1
tests/client_test.c:
  Merge with 4.1
2004-09-06 15:14:10 +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 Apply patch from Novell 2004-06-29 18:19:35 +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 novell41b.patch 2003-03-05 18:52:47 -05:00