summaryrefslogtreecommitdiff
path: root/netware
Commit message (Collapse)AuthorAgeFilesLines
* Fixed warning message breakage.unknown2006-08-132-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed install breakage (my own fault) Edited exampled cnf to remove bdb references. mysql-test/r/backup.result: fix warnings mysql-test/r/im_options.result: Remove missed bdb skip mysql-test/r/im_utils.result: Remove missed bdb-skip mysql-test/r/log_tables.result: Fix warnings mysql-test/r/show_check.result: Fix warnings mysql-test/r/sp_trans.result: Fix warning mysql-test/r/type_timestamp.result: Fix warning mysql-test/r/warnings.result: Fix warning mysql-test/t/disabled.def: Disabled Federation test mysql-test/t/federated_transactions.test: Fixed comments in federation test netware/mysql_install_db.c: Fix install breakage. netware/mysql_test_run.c: Fix install breakage. scripts/mysql_install_db.sh: Fix install breakage storage/myisam/ftbench/ft-test-run.sh: Fixed test which is never run support-files/my-innodb-heavy-4G.cnf.sh: Modified examples support-files/my-small.cnf.sh: Modified examples
* Merge chilla.local:/home/mydev/mysql-5.0-mmergeunknown2006-07-203-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mwldnlm, mwccnlm, mwasmnlm:unknown2006-07-033-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Use Perl for filtering, do more filtering netware/BUILD/mwasmnlm: Use Perl for filtering, do more filtering netware/BUILD/mwccnlm: Use Perl for filtering, do more filtering netware/BUILD/mwldnlm: Use Perl for filtering, do more filtering
| * Makefile.am:unknown2006-07-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicate symbol errors on Netware mwldnlm, mwccnlm, mwasmnlm: Filter garbage characters from output netware/BUILD/mwasmnlm: Filter garbage characters from output netware/BUILD/mwccnlm: Filter garbage characters from output netware/BUILD/mwldnlm: Filter garbage characters from output tests/Makefile.am: Avoid duplicate symbol errors on Netware
* | Mergeunknown2006-06-203-16/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged storage/ndb/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged BUILD/compile-dist: SCCS merged netware/Makefile.am: SCCS merged netware/BUILD/compile-netware-END: SCCS merged
| * Mergeunknown2006-06-172-12/+2
| |\ | | | | | | | | | | | | BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571: Auto merged
| | * .del-mysql_install.def~8da659e7c0f7e571:unknown2006-06-162-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete: netware/mysql_install.def Makefile.am: Removed obsolete "mysql_install.def" netware/Makefile.am: Removed obsolete "mysql_install.def" BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571: Delete: netware/mysql_install.def
| * | configure.in, net_serv.cc, compile-netware-END:unknown2006-06-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes for Netware sql/net_serv.cc: Netware needs <sys/select.h> configure.in: Call of "comp_err" has moved, changed code for Netware that edits make files to reflect this netware/BUILD/compile-netware-END: After correcting "configure.in" to edit make files correctly, removed obsolete "sed" of "extra/Makefile.am" for Netware
| * | .libs is no longer used when compiling netwareunknown2006-04-031-1/+1
| | | | | | | | | | | | | | | netware/BUILD/compile-linux-tools: .libs/sql is no longer used when compiling netware
* | | Mergeunknown2006-04-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/mysqldemb/mysqldemb.vcproj: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/storage/bdb/bdb.vcproj: Auto merged VC++Files/storage/innobase/innobase.vcproj: Auto merged config/ac-macros/yassl.m4: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged sql/item.cc: Auto merged
| * | Mergeunknown2006-04-031-1/+1
| |\ \ | | |/ | | | | | | | | | scripts/mysql_install_db.sh: Auto merged
| | * Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2006-04-031-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new scripts/mysql_install_db.sh: Auto merged
| | | * mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:unknown2006-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed web address order.mysql.com to shop.mysql.com netware/mysql_install_db.c: Changed web address order.mysql.com to shop.mysql.com Docs/MySQLEULA.txt: Changed web address order.mysql.com to shop.mysql.com scripts/mysql_install_db.sh: Changed web address order.mysql.com to shop.mysql.com
* | | | Merge mysql.com:/home/kgeorge/mysql/5.0/B15102unknown2006-03-271-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.1/B15102 netware/BUILD/compile-netware-START: Auto merged
| * | | added option for netware buildunknown2006-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | netware/BUILD/compile-netware-START: added option for netware builds
* | | | added option for netware buildunknown2006-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | netware/BUILD/compile-netware-START: added option for netware builds
* | | | Several Netware specific fixes.unknown2006-02-028-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: To configure InnoDB for cross compilation. include/config-netware.h: NetWare specific change to fix the compilation errors caused by event.h NetWare specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3) netware/BUILD/compile-AUTOTOOLS: Netware specific change reflecting the change in source code directory structure. netware/BUILD/compile-linux-tools: Netware specific change to fix the location where gen_lex_hash gets created. Fixed also directory structure reflecting changes. netware/BUILD/compile-netware-END: Netware specific change for creating mysqld_error.h netware/BUILD/mwenv: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/BUILD/nwbootstrap: NetWare Specific change to produce absoulte path for XDC file. netware/Makefile.am: Netware specific changes to fix to match new directory structure. netware/my_manage.h: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/mysql_test_run.c: Netware specific change, added --autoclose option for mysql_test_run.nlm. scripts/make_binary_distribution.sh: Fix to reflect change in directory structure. sql/mysqld.cc: Stacksize change for Netware. Netware specific change to fix the compilation errors caused by event.h sql/set_var.cc: Minor indending related fix. sql/sql_class.cc: Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro. storage/innobase/os/os0thread.c: Netware specific change to increase the thread stack size. storage/myisam/mi_locking.c: Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
* | | | Manually mergedunknown2006-01-162-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/innobase/os/os0thread.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged
| * | | Fix for Netware build.unknown2006-01-121-1/+1
| | | |
| * | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2006-01-121-6/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 client/mysqlimport.c: Auto merged include/config-netware.h: Auto merged innobase/os/os0thread.c: Auto merged netware/mysqld_safe.c: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Merged from 4.1. sql/sql_base.cc: Merged from 4.1. sql/sql_handler.cc: Merged from 4.1. sql/sql_select.cc: Merged from 4.1.
| | * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2006-01-121-6/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 include/config-netware.h: Auto merged innobase/os/os0thread.c: Auto merged netware/mysqld_safe.c: Merge from 4.0 to 4.1 sql/mysqld.cc: Merge from 4.0 to 4.1
| | | * NetWare specific change to increase thread stack size.unknown2006-01-121-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to Netware specific mysqld_safe.c include/config-netware.h: NetWare specific change to increase thread stack size. innobase/os/os0thread.c: NetWare specific change to increase thread stack size. netware/mysqld_safe.c: NetWare specific change to make multiple mysqld_safe instances work when called through a NCF file. sql/mysqld.cc: NetWare specific change to increase thread stack size.
* | | | mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:unknown2005-12-192-1/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "client/mysqlslap" mysqlslap.vcproj, mysqlslap.def: new file VC++Files/mysql.sln: Added "client/mysqlslap" netware/Makefile.am: Added "client/mysqlslap" scripts/make_binary_distribution.sh: Added "client/mysqlslap" support-files/mysql.spec.sh: Added "client/mysqlslap"
* | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1unknown2005-12-1313-4/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 netware/libmysql.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/perror.def: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/tztime.cc: Auto merged netware/BUILD/compile-linux-tools: Merged from 4.1 netware/my_print_defaults.def: Merged from 4.1 netware/mysqladmin.def: Merged from 4.1
| * | Minor Netware specific changes.unknown2005-12-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/BUILD/compile-linux-tools: Fixed compilation problem with Linux tools. scripts/make_binary_distribution.sh: Netware specific changes. Discard platform specific files and added a couple of missing files. sql/tztime.cc: Code not ported to Netware yet.
| * | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-12-1313-0/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 netware/libmysql.def: Auto merged netware/my_print_defaults.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/perror.def: Auto merged
| | * Increased stack size for clients on Netware.unknown2005-12-1313-0/+13
| | | | | | | | | | | | | | | | | | | | | New libc suggests doing this.
* | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1unknown2005-12-041-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 client/mysql.cc: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Auto merged client/mysqlshow.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged netware/mysql_test_run.c: Merged from 4.1.
| * | Fixes multi_statement test case on NetWare.unknown2005-12-041-0/+4
| | |
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-221-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * \ \ Mergeunknown2005-11-041-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| | | * | Makefile.am, configure.in:unknown2005-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* | | | | Netware specific changes for 5.0.16aunknown2005-11-181-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Fixed option. client/mysqladmin.cc: Fixed option. client/mysqlbinlog.cc: Fixed option. client/mysqlcheck.c: Fixed option. client/mysqldump.c: Fixed option. client/mysqlimport.c: Fixed option. client/mysqlshow.c: Fixed option. configure.in: Changed version for Netware. myisam/myisamchk.c: Fixed option. myisam/myisampack.c: Fixed option. netware/mysql_test_run.c: NetWare specific changes: Define MYSQL_CHECK environment variable to make mysqlcheck test case pass
* | | | - after merge fixesunknown2005-10-283-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Auto merged BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Auto merged configure.in: Auto merged netware/BUILD/compile-linux-tools: Auto merged netware/BUILD/compile-netware-END: Auto merged man/Makefile.am: - after merge fix support-files/mysql.spec.sh: - after merge fix
| * | | Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0unknown2005-10-273-3/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/lenz/mysql-4.1 netware/BUILD/compile-linux-tools: Auto merged
| | * | - cleanup: removed the empty NEW-RPMS directory and all referencesunknown2005-10-273-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl script (we now use Do-pkg for building OS X packages) BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24: Delete: NEW-RPMS/.cvsignore BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206: Delete: support-files/MacOSX/make_mysql_pkg.pl netware/BUILD/compile-linux-tools: - removed reference to the NEW-RPMS directory netware/BUILD/compile-netware-END: - removed reference to the NEW-RPMS directory netware/BUILD/compile-netware-src: - removed reference to the NEW-RPMS directory
| * | | Manually mergedunknown2005-10-271-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-netware.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manually merged fix for bug#13855 mysql-test/t/select.test: Manuall merged fix for bug#13855
| | * | Imported fixes from 4.1 and 5.0 to 4.0.unknown2005-10-251-1/+1
| | | |
| * | | Imported fix from 5.0.unknown2005-10-261-1/+1
| | | |
* | | | Fixed stack overflow problem and abnormal end on Netware.unknown2005-10-181-0/+1
| | | |
* | | | Small fixes for Netware.unknown2005-10-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/mysql_test_run.c: Fixed typo. netware/pack_isam.def: Added screenname. scripts/make_binary_distribution.sh: Fixed mistake in merge.
* | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpunknown2005-10-132-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 configure.in: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_pthread.h: Auto merged myisam/mi_search.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/select.test: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged netware/pack_isam.def: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged strings/xml.c: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged mysql-test/r/select.result: Merged from 4.1. netware/BUILD/mwenv: Merged from 4.1. scripts/make_binary_distribution.sh: Merged from 4.1. sql/mysqld.cc: Merged from 4.1. sql/sql_show.cc: Merged from 4.1. strings/my_strtoll10.c: Merged from 4.1.
| * | | Some Netware related fixes and fixes for Metrowerks compiler.unknown2005-10-132-2/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/BUILD/mwenv: Removed -O3 for Metrowerks compiler. netware/pack_isam.def: NetWare specific change, Added SCRENNAME for pack_isam. scripts/make_binary_distribution.sh: Netware specific change for creating help tables. strings/my_strtoll10.c: Fix for Metrowerks compiler.
* | | Applied a couple of Netware related patches.unknown2005-08-282-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/mysql_test_run.c: - Added missing cast to resolve compilation issues. - run_test() in mysql_test_run.c needs to check the correct error value returned by abort_not_supported_test(). This resolves the problem with skipped test cases on NetWare, which are supposed to be marked 'skip' instead of 'bad'. netware/mysqladmin.def: Increased stack size to avoid stack overflow in mysqladmin.NLM
* | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1unknown2005-08-269-8/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Auto merged BitKeeper/etc/config: Auto merged client/mysql.cc: Auto merged client/mysqlcheck.c: Auto merged BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged netware/myisamchk.def: Auto merged netware/mysql.def: Auto merged netware/mysql_test_run.c: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.c: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_blackhole.h: Auto merged sql/mysqld.cc: Auto merged client/client_priv.h: Merged from 4.1 client/mysqladmin.cc: Merged from 4.1 client/mysqlbinlog.cc: Merged from 4.1 mysys/charset.c: Merged from 4.1
| * | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-08-259-8/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysqlcheck.c: Auto merged client/mysqlimport.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged myisam/myisamlog.c: Auto merged netware/myisamchk.def: Auto merged netware/mysql.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged client/client_priv.h: Merged from 4.0. client/mysql.cc: Merged from 4.0. client/mysqladmin.cc: Merged from 4.0. client/mysqlbinlog.cc: Merged from 4.0. client/mysqldump.c: Merged from 4.0. client/mysqlshow.c: Merged from 4.0. myisam/myisamchk.c: Merged from 4.0. myisam/myisampack.c: Merged from 4.0. netware/mysql_test_run.c: Merged from 4.0. netware/mysqld_safe.c: Merged from 4.0. sql/mysqld.cc: Merged from 4.0.
| | * Several fixes for Netware.unknown2005-08-2410-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/client_priv.h: Added option auto close for Netware. client/mysql.cc: Added option auto close for Netware. client/mysqladmin.c: Added option auto close for Netware. client/mysqlbinlog.cc: Added option auto close for Netware. client/mysqlcheck.c: Added option auto close for Netware. client/mysqldump.c: Added option auto close for Netware. client/mysqlimport.c: Added option auto close for Netware. client/mysqlshow.c: Added option auto close for Netware. client/mysqltest.c: Fixed help messages for Netware. extra/my_print_defaults.c: Fixed help messages for Netware. extra/perror.c: Fixed help messages for Netware. extra/resolve_stack_dump.c: Fixed help messages for Netware. include/help_end.h: Fixed help messages for Netware. include/help_start.h: Fixed help messages for Netware. isam/isamchk.c: Added auto close of window for Netware isam/pack_isam.c: Added auto close of window for Netware myisam/myisamchk.c: Added auto close of window for Netware myisam/myisamlog.c: Added help for Netware. myisam/myisampack.c: Added auto close for Netware. netware/myisamchk.def: Scrollable screen patch. netware/mysql.def: Scrollable screen patch. netware/mysql_test_run.c: Fixed strindex for Netware. netware/mysqladmin.def: Scrollable screen patch. netware/mysqlbinlog.def: Scrollable screen patch. netware/mysqlcheck.def: Scrollable screen patch. netware/mysqld_safe.c: Removed debug message for Netware. netware/mysqldump.def: Scrollable screen patch. netware/mysqlimport.def: Scrollable screen patch. netware/mysqlshow.def: Scrollable screen patch. sql/mysqld.cc: Abnormal end patch when shutting down and volume not ready.
| | * Some minor fixes for Netware. These were required after we started buildingunknown2005-08-181-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against a later version of libc. include/config-netware.h: Changes for Netware. Needed to build against newer libc. netware/BUILD/nwbootstrap: Fix to build script. sql/mysqld.cc: Added an include.
| | * Netware build environment script related patch.unknown2005-03-081-2/+2
| | |
View Lorry Controller Status