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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge bk-internal:/home/bk/mysql-5.0	unknown	2006-11-08	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0 configure.in: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged
\| *	Bump version to 5.0.30	unknown	2006-11-07	1	-2/+2
\| \|
* \|	Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt	unknown	2006-11-07	1	-0/+8
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt configure.in: Auto merged include/my_time.h: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/rename.test: Auto merged sql-common/my_time.c: Auto merged sql/item_timefunc.cc: Auto merged sql/time.cc: Auto merged
\| *	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint	unknown	2006-10-25	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into siva.hindu.god:/usr/home/tim/m/bk/50 configure.in: Auto merged
\| \| *	Merge siva.hindu.god:/usr/home/tim/m/bk/g50	unknown	2006-10-24	1	-2/+2
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into siva.hindu.god:/usr/home/tim/m/bk/50 configure.in: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/view.test: Auto merged mysys/mf_iocache.c: Auto merged sql/item_func.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged myisam/sort.c: Manual merge mysql-test/r/innodb_mysql.result: Manual merge mysql-test/t/innodb_mysql.test: Manual merge
\| * \| \	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint	unknown	2006-10-24	1	-0/+4
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union configure.in: Auto merged include/mysql.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged include/Makefile.am: Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0
\| \| * \|	WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks	unknown	2006-10-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BUG#23427 incompatible ABI change in 5.0.26? - Use the icheck tool if avaliable and compare the current mysql.h to a version controlled reference file BitKeeper/etc/ignore: Added include/check_abi include/mysql_h.ic to the ignore list configure.in: Look for icheck in configure include/Makefile.am: Add rule to build mysql_h.ic if icheck is avaliable Add rule to compare mysql_h.ic to the version controlled reference file mysql_h_abi.ic include/mysql.h: Add comment about taking care when editing mysql.h Add example how to add reserved fiels in the structs to allow for features to be added without breaking ABI include/mysql_h_abi.ic: Add new file describing the libmysqlclient ABI used as a reference to detect ABI breakage
\| * \| \|	Replace all refernces to .la libraries with direct references	unknown	2006-10-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime	unknown	2006-11-06	1	-0/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191 configure.in: Auto merged sql/mysql_priv.h: Auto merged
\| * \| \|	Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191	unknown	2006-11-01	1	-0/+7
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191 configure.in: Auto merged include/my_time.h: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/timezone2.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/timezone2.test: Auto merged sql/mysql_priv.h: Auto merged sql/time.cc: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged sql-common/my_time.c: manual merge sql/item_timefunc.cc: manual merge sql/tztime.cc: manual merge
\| \| * \|	Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"	unknown	2006-11-01	1	-0/+7
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(4.1 version, with post-review fixes) The fix for another Bug (6439) limited FROM_UNIXTIME() to TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT, however unix timestamp in general is not considered to be limited by this value. All dates up to power(2,31)-1 are valid. This patch extends allowed TIMESTAMP range so, that max TIMESTAMP value is power(2,31)-1. It also corrects FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME() is fixed accordingly to allow conversion of dates up to 2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ() function to allow extended range of dates. The main problem solved in the patch is possible overflows of variables, used in broken-time representation to time_t conversion (required for UNIX_TIMESTAMP). acinclude.m4: Add new macro to check time_t range configure.in: Call the macro to check time_t range include/my_time.h: Move time-related defines to proper place. Add a function to perform a rough check if a TIMESTAMP value fits into the boundaries. Note: it is defined as "static inline", as otherwise libmysql won't compile (due to the way how gcc handles "inline" directive). mysql-test/r/func_time.result: Update test result mysql-test/r/timezone.result: Update test result mysql-test/r/timezone2.result: Update test result mysql-test/t/func_time.test: Add test for Bug#9191 and update test to be consistent with new TIMESTAMP boundaries mysql-test/t/timezone.test: Update old tests to be consistent with new TIMESTAMP boundaries mysql-test/t/timezone2.test: Update tests for convert_tz to be consistent with new TIMESTAMP boundaries sql/item_timefunc.cc: Fix convert_tz to allow dates from the new (extended) TIMESTAMP range sql/mysql_priv.h: Move time handling defaults to my_time.h sql-common/my_time.c: Because of increased TIMESTAMP_MAX_VALUE overflows in my_system_gmt_sec() became possible. Here we make it safe against the overflows by stepping back from the boundary dates which are likely to trigger them. sql/time.cc: Update TIME_to_timestamp to allow conversion of extended date range sql/tztime.cc: Fix new (4.1) implementation of broken-down time representation to time_t conversion routine to avoid overflows during conversion of boundary dates mysql-test/r/timezone4.result: New BitKeeper file ``mysql-test/r/timezone4.result'' mysql-test/t/timezone4-master.opt: New BitKeeper file ``mysql-test/t/timezone4-master.opt'' mysql-test/t/timezone4.test: New BitKeeper file ``mysql-test/t/timezone4.test''
* \| \|	Bump version number to 5.0.29, as 28 will be based directly on 27.	unknown	2006-10-24	1	-2/+2
\| \| \|
* \| \|	configure.in:	unknown	2006-10-21	1	-2/+2
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raised version number to 5.0.28 configure.in: Raised version number to 5.0.28
* \|	Raise version number	unknown	2006-10-02	1	-2/+2
\| \|
* \|	Merge trift2.:/MySQL/M50/extract1-5.0	unknown	2006-09-21	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged
\| * \|	Include "manual.chm" in the source distribution, because we now use it for ↵	unknown	2006-09-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Windows builds unchanged.
* \| \|	Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602	unknown	2006-09-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged
\| * \| \|	Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c	unknown	2006-09-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. configure.in: Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1)
* \| \| \|	Merge msvensson.mysql.internal:mysql/my50-m-bug16576	unknown	2006-09-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged
\| * \| \| \|	Bug#16576 Patch to compile on GNU/Hurd (ps check in configure)	unknown	2006-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Thanks to Christian Hammers for the patch configure.in: The configure check on how to run ps to get mysqld's $PID does not work on the Hurd, as the PPID is prepended with a - for login shells, thus making grep look for -bash, which it complains as an invalid argument. Filtering out '-' from the ps output makes this work fine.
* \| \| \| \|	configure.in : NDB version and general version must be (kept) in sync - ↵	unknown	2006-09-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do that. configure.in: NDB version and general version must be (kept) in sync - do that.
* \| \| \| \|	Merge trift2.:/M50/clone-5.0	unknown	2006-09-07	1	-1/+2
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into trift2.:/M50/push-5.0 configure.in: Auto merged
\| * \| \| \|	Fix a change to "configure.in" that broke building commercial sources.	unknown	2006-09-07	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To be pushed to both the cloned 5.0.25 and the general 5.0 tree. configure.in: When creating "commercial" sources, this file gets modified by "mysql-copyright". For this, it is essential that the string 'cmd-line-utils/readline/Makefile' be alone on its line ...
* \| \| \| \|	Raise version number	unknown	2006-09-06	1	-1/+1
\|/ / / /
* \| \| \|	Modification for win subdirectory	unknown	2006-09-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: added win subdir
* \| \| \|	Cset exclude: msvensson@neptunus.(none)\|ChangeSet\|20060612110740\|13873	unknown	2006-08-24	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Exclude dbug/dbug.c: Exclude
* \| \| \|	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	unknown	2006-08-01	1	-6/+9
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysql.test: Auto merged sql/field.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged
\| * \|	Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517	unknown	2006-07-20	1	-6/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into maint1.mysql.com:/data/localhome/msvensson/my50-bug19517 configure.in: Auto merged
\| \| * \|	Bug#19517 No simple way to detect wether server was compiled with libdbug	unknown	2006-06-12	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Define DBUG_ON and DBUG_OFF in config.h configure.in: Define DBUG_ON and DBUG_OFF in config.h instead of in compiler flags dbug/dbug.c: Undef DBUG_OFF if defined when compiling dbug.c, this is done as we always compile dbug.c even when DBUG_OFF is selected.
* \| \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1	unknown	2006-07-29	1	-1/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0 configure.in: Auto merged
\| * \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2006-07-29	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged
\| \| * \| \|	configure.in:	unknown	2006-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected typo configure.in: Corrected typo
* \| \| \| \|	Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge	unknown	2006-07-29	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge configure.in: Auto merged man/Makefile.am: Auto merged mysys/my_bitmap.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/sql_locale.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/t/mysqlbinlog.test: Manual merge. sql/sql_select.cc: Manual merge.
\| * \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2006-07-28	1	-0/+4
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: SCCS merged
\| \| * \|	Makefile.am, configure.in:	unknown	2006-07-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Man page for mysqld command move to section 8 (bug#21220) configure.in: Man page for mysqld command move to section 8 (bug#21220) man/Makefile.am: Man page for mysqld command move to section 8 (bug#21220)
\| \| * \|	Add a more reliable "getconf" test for Linuxthreads. The later trees should ↵	unknown	2006-07-07	1	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	already have a better test (and so this should be null-merged there). ALSO! Make it so that it accepts NPTL as a valid _equivalent_ implementation.
\| \| * \|	configure.in:	unknown	2006-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stepped up to 4.0.28 configure.in: Stepped up to 4.0.28
\| * \| \|	Increment the version number to 4.1.22, as 4.1.21 is cloned.	unknown	2006-07-14	1	-2/+2
\| \| \| \|
* \| \| \|	Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0	unknown	2006-07-13	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged tests/mysql_client_test.c: manual merge
\| * \ \ \	Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470	unknown	2006-07-12	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P configure.in: Auto merged
\| \| * \| \| \|	Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops	unknown	2006-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug is thqt we use some nonstandard assembly codes in our strings source, and some assemblers don't know what to do with them: Specifically, Sun's Solaris assembler and Apple's Darwin assembler balk at them. This patch, rather than trying to test for properties of the assembler, which Autoconf doesn't have any decent facilites for, instead tries to compile the code in question and disables assembly if it fails. There's still the problem of unportable assembly, but I'll leave that to someone who feels like rewriting and debugging it. configure.in: Actually try to compile the code in question, since a test for the CPU type is insufficient to determine whether our code will compile.
* \| \| \| \| \|	Raise the version number.	unknown	2006-07-11	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1	unknown	2006-06-30	1	-4/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| / / / \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0 configure.in: Auto merged
\| * \| \| \|	Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter	unknown	2006-06-27	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Replaced skip-locking with newer skip-external-locking option. Removed extra quotes. scripts/mysqld_safe-watch.sh: Replaced skip-locking with newer skip-external-locking option.
\| * \| \| \|	configure.in:	unknown	2006-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update NDB version as well configure.in: Update NDB version as well
\| * \| \| \|	configure.in:	unknown	2006-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stepped up to 4.1.22 configure.in: Stepped up to 4.1.22
\| * \| \| \|	configure.in:	unknown	2006-04-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed version to 4.1.20 configure.in: Changed version to 4.1.20
* \| \| \| \|	Increment the version number.	unknown	2006-06-29	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge xiphis.org:/home/antony/work2/p4-bug12096.2	unknown	2006-06-28	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into xiphis.org:/home/antony/work2/p4-bug12096.2-merge configure.in: Auto merged sql/mysqld.cc: Auto merged
\| * \| \| \| \|	Bug#12096	unknown	2006-05-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Add line for non-executable stack in .s files" Fix so that configure will use "--noexecstack" for assembler if gcc supports option and compiled C doesn't need executable stack. config/ac-macros/compiler_flag.m4: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler configure.in: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler strings/Makefile.am: Bug#12096 Automake knows how to handle assembler