mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/netware
History
unknown bb2d3eaa30 Merge with 4.1 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_base.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/password.c:
  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_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged
sql/udf_example.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Makefile.am:
  Simple merge
client/mysqldump.c:
  Simple merge
configure.in:
  Simple merge
libmysqld/lib_sql.cc:
  Automatic merge
mysql-test/r/func_str.result:
  Automatic merge
mysql-test/r/grant.result:
  simple merge
mysql-test/r/multi_update.result:
  automatc merge
mysql-test/r/ps.result:
  automatic merge
mysql-test/r/ps_2myisam.result:
  Automatic merge
mysql-test/r/ps_3innodb.result:
  Automatic merge
mysql-test/r/ps_4heap.result:
  Automatic merge
mysql-test/r/ps_5merge.result:
  Automatic merge
mysql-test/r/ps_6bdb.result:
  Automatic merge
mysql-test/r/ps_7ndb.result:
  Automatic merge
mysql-test/r/show_check.result:
  Automatic merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/grant.test:
  Automatic merge
mysql-test/t/multi_update.test:
  Automatic merge
mysql-test/t/ps.test:
  Automatic merge
mysql-test/t/show_check.test:
  Automatic merge
ndb/docs/wl2077.txt:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
scripts/mysql_fix_privilege_tables.sh:
  merge
sql/item.cc:
  Merge (difficult)
sql/item.h:
  simple merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Simple merge
sql/item_subselect.h:
  Automatic merge
sql/mysql_priv.h:
  Simple merge
sql/slave.h:
  Automatic merge
sql/sql_base.cc:
  Removed code that was backported to 4.1
sql/sql_class.h:
  Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
  simple merge
sql/sql_insert.cc:
  Merge (difficult as logic had changed both in 4.1 and 5.0)
  Some coded moved here from sql_class.h
sql/sql_parse.cc:
  Merge (difficult)
sql/sql_prepare.cc:
  Simple merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Simple merge
sql/sql_update.cc:
  Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
  Simple merge
tests/client_test.c:
  Simple merge
2004-12-22 13:54:39 +02:00
..
BUILD Portability fixes (For Netware) 2004-07-01 17:26:45 +03: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 Applied some patches for Netware. 2004-11-29 18:32:52 +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 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 Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
myisam_ftdump.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
myisamchk.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
myisamlog.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
myisampack.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysql.def Applied some patches for Netware. 2004-11-29 18:32:52 +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.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysql_install_db.c Added patches from Novell 2004-05-25 22:00:14 +03:00
mysql_install_db.def Applied some patches for Netware. 2004-11-29 18:32:52 +02: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 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 Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqlbinlog.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqlcheck.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqld.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqld_safe.c After merge fixes 2004-06-21 10:21:20 +03:00
mysqld_safe.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqldump.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqlimport.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqlshow.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
mysqltest.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
pack_isam.def Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
perror.def Applied some patches for Netware. 2004-11-29 18:32:52 +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