delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain ↵	unknown	2006-11-28	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrong - drop it. netware/BUILD/nwbootstrap: Editing "mwenv" is now obsolete, as this file gets its variable settings from the environment already; and it is even plain wrong, because the assignments to those variables are written in such a way that replacing the variables by values (as tried here) yields invalid shell lines.
* \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2006-11-02	6	-7/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged configure.in: Auto merged include/my_global.h: Auto merged include/mysql.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/log_tables.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/view.test: Auto merged netware/BUILD/mwenv: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/Makefile.am: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged tests/mysql_client_test.c: Auto merged include/my_time.h: manual merge. mysql-test/mysql-test-run.pl: manual merge. mysql-test/r/ps.result: manual merge. mysql-test/t/disabled.def: manual merge. mysql-test/t/ps.test: manual merge.
\| * \	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-24	1	-0/+7
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysqldump.c: Auto merged sql/sql_show.cc: Auto merged configure.in: Manual merge, the filesed of Makfile.in has been removed but needed to add it back in to convert .la libs to .a libs
\| \| *	Replace all refernces to .la libraries with direct references	unknown	2006-10-24	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to their .libs/*.a library Add comment describing why mwldnlm is called with "x" flag configure.in: Replace references to yassl .la libraries with direct reference to the .a libraries netware/BUILD/mwldnlm: Add comment about why mwldnlm is called with the "x" flag and how to avoid it
\| * \|	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-24	2	-4/+15
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint include/mysql.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged netware/BUILD/compile-netware-END: Auto merged scripts/make_binary_distribution.sh: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged netware/BUILD/mwenv: Merge
\| \| *	Temporary fixes for building from source dist in pushbuild	unknown	2006-10-24	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-netware-END: If running as user pushbuild don't run autotools again netware/BUILD/mwenv: Set ARFLAGS to value of AR_FLAGS
\| \| *	When looking for libc the path need to be converted from wine to unix format ↵	unknown	2006-10-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	before test that directory exists
\| * \|	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016	unknown	2006-10-17	1	-3/+3
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/deleted/.del-collapsed: auto-union BitKeeper/etc/collapsed: auto-union Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_dbug.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/csv.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/mysql.test: Auto merged netware/BUILD/compile-netware-END: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_view.h: Auto merged sql-common/my_time.c: Auto merged sql/time.cc: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged mysql-test/include/mix1.inc: Manual merge. mysql-test/r/func_time.result: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/func_time.test: Manual merge. mysql-test/t/view.test: Manual merge. sql/sql_view.cc: Manual merge.
\| \| *	Use autorun.sh from BUILD/ instead of netware specific version	unknown	2006-10-12	1	-3/+3
\| \| \|
\| * \|	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-12	3	-0/+0
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint netware/BUILD/compile-netware-max-debug: Auto merged netware/BUILD/compile-netware-max: Auto merged
\| \| *	Make all compile-netware-* scripts executable	unknown	2006-10-12	3	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-netware-max: Change mode to -rwxrwxr-x netware/BUILD/compile-netware-max-debug: Change mode to -rwxrwxr-x netware/BUILD/compile-netware-src: Change mode to -rwxrwxr-x
\| * \|	5.1 should use libc-2006 by default	unknown	2006-10-12	1	-2/+2
\| \| \|
\| * \|	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-12	1	-2/+13
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint netware/BUILD/mwenv: Auto merged
\| \| *	Use libc-2003 if available else default to libc	unknown	2006-10-12	1	-2/+13
\| \| \|
\| * \|	Only one switch for ssl(--with-ssl) in 5.1	unknown	2006-10-12	2	-2/+2
\| \| \|
\| * \|	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-12	2	-2/+2
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
\| \| *	Switch to use yaSSL instead of OpenSSL on Netware	unknown	2006-10-12	2	-2/+2
\| \| \|
\| * \|	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-10-11	1	-0/+10
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint netware/BUILD/mwenv: Auto merged
\| \| *	Check that TERM has been set to avoid problem "Error opening	unknown	2006-10-11	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	terminal: unknown" when the script is executed using non interactive ssh Set TERM to "linux" as default netware/BUILD/mwenv: Check that TERM has been set to avoid problem "Error opening terminal: unknown" when the script is executed using non interactive ssh
\| \| *	Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp	unknown	2006-09-28	2	-87/+14
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union
* \| \| \|	Various tool fixes, necessary to build 5.1.12-beta on Netware.	unknown	2006-10-12	4	-11/+15
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-AUTOTOOLS: Fixes for Netware builds: 1) The "autotools" used there have problems with changing variables in Makefiles after the initial setting. 2) "storage/innobase" does not need an autotool run any more. 3) "automake --verbose" may be able to help if new problems arise. netware/BUILD/compile-netware-START: The CSV engine is now mandatory in 5.1, must not be de-configured. netware/BUILD/mwenv: When testing for a possibly empty shell variable, it is mandatory to use quotes! netware/BUILD/nwbootstrap: The "mwenv" file has been changed, reflect these changes here: 1) It is no longer necessary to set the variables WINE_BUILD_DIR, BUILD_DIR, and VERSION. 2) The handling of MYDEV there has changed, the "export" line may be indented.
* \| \|	Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp	unknown	2006-09-28	2	-87/+14
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/etc/ignore: auto-union netware/Makefile.am: Auto merged
\| * \|	Build fixes for netware/ directory	unknown	2006-09-27	2	-87/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create the file netware/libmysql.imp from libmysql/libmysql.def - Remove the outdated netware/libmysql.imp file from version control BitKeeper/deleted/.del-libmysql.imp: Delete: netware/libmysql.imp BitKeeper/etc/ignore: Added netware/libmysql.imp to the ignore list netware/Makefile.am: Build libmysql.imp from libmysql/libmysql.def
* \| \|	Merge neptunus.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-26	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/work/my51-work netware/BUILD/mwenv: Auto merged
\| * \|	Fir problem with winepath in mwenv	unknown	2006-09-26	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \| \| \|	netware/BUILD/mwenv: Add extra / after $base for winepath to work correctly Add / between $base and WINE_BUILD_DIR
* \|	Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware	unknown	2006-09-26	3	-12/+36
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/netware/my51-netware netware/Makefile.am: Auto merged netware/BUILD/mwenv: Merge 5.0 -> 5.1
\| *	Hardcode the fact that we are using zlib 1.2.3(previously done via symlink ↵	unknown	2006-09-26	1	-2/+2
\| \| \| \| \| \| \| \|	zlib-1.1.4)
\| *	Netware changes for build with yaSSL	unknown	2006-09-22	3	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Make mwenv automatically adapt the setting to current build dir. - Fix include paths that mwccnlm does not understand - Link libmysl with yassl netware/BUILD/mwccnlm: Update mwccnlm to convert -I../.. to -I../../ netware/BUILD/mwenv: Automatically detect current build dir and based on that calculate current build dir in winw format. Allow caller to define MYDEV to override the defatul "F:/mydev" Set all paths from these three variables netware/Makefile.am: Link libmysql with yassl_libs
* \|	Fixed warning message breakage.	unknown	2006-08-13	2	-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-mmerge	unknown	2006-07-20	3	-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:	unknown	2006-07-03	3	-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:	unknown	2006-07-03	3	-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
* \|	Merge	unknown	2006-06-20	3	-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
\| *	Merge	unknown	2006-06-17	2	-12/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571: Auto merged
\| \| *	.del-mysql_install.def~8da659e7c0f7e571:	unknown	2006-06-16	2	-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:	unknown	2006-06-17	1	-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 netware	unknown	2006-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-linux-tools: .libs/sql is no longer used when compiling netware
* \| \|	Merge	unknown	2006-04-04	1	-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
\| * \|	Merge	unknown	2006-04-03	1	-1/+1
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	scripts/mysql_install_db.sh: Auto merged
\| \| *	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2006-04-03	1	-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:	unknown	2006-04-03	1	-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/B15102	unknown	2006-03-27	1	-1/+0
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/kgeorge/mysql/5.1/B15102 netware/BUILD/compile-netware-START: Auto merged
\| * \| \|	added option for netware build	unknown	2006-03-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-netware-START: added option for netware builds
* \| \| \|	added option for netware build	unknown	2006-03-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-netware-START: added option for netware builds
* \| \| \|	Several Netware specific fixes.	unknown	2006-02-02	8	-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 merged	unknown	2006-01-16	2	-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.	unknown	2006-01-12	1	-1/+1
\| \| \| \|
\| * \| \|	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1	unknown	2006-01-12	1	-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.0	unknown	2006-01-12	1	-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.	unknown	2006-01-12	1	-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.