unknown 8c6fe3587c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 ... into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged cmd-line-utils/readline/display.c: Auto merged configure.in: Auto merged extra/yassl/include/buffer.hpp: Auto merged extra/yassl/include/crypto_wrapper.hpp: Auto merged extra/yassl/include/yassl_imp.hpp: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/src/crypto_wrapper.cpp: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged extra/yassl/taocrypt/include/des.hpp: Auto merged extra/yassl/taocrypt/include/hash.hpp: Auto merged extra/yassl/taocrypt/include/hmac.hpp: Auto merged extra/yassl/taocrypt/include/modarith.hpp: Auto merged extra/yassl/taocrypt/include/modes.hpp: Auto merged extra/yassl/taocrypt/include/rsa.hpp: Auto merged extra/yassl/taocrypt/include/type_traits.hpp: Auto merged extra/yassl/taocrypt/mySTL/list.hpp: Auto merged extra/yassl/taocrypt/src/aes.cpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/taocrypt/src/asn.cpp: Auto merged extra/yassl/testsuite/testsuite.cpp: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysys/default.c: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.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_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_select.cc: Auto merged extra/yassl/taocrypt/test/test.cpp: Manual merge mysql-test/r/grant.result: Manual merge mysql-test/r/select.result: Manual merge mysql-test/t/grant.test: Manual merge mysql-test/t/select.test: Manual merge sql/field.h: Manual merge sql/mysqld.cc: Manual merge		2007-02-06 15:46:17 +01:00
..
MacOSX	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
RHEL4-SElinux	For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide	2007-01-25 17:51:21 +01:00
SCO	- added support-files/MacOSX to include files specific for building	2003-02-03 20:39:48 +01:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
binary-configure.sh	Fixes for fill_help_tables.sql	2003-03-21 18:53:55 +02:00
build-tags	Here comes a nasty patch, although I am not ready to push it yet. I will	2002-01-19 19:16:52 -07:00
compiler_warnings.supp	after merge fixes	2007-01-29 16:13:18 +02:00
magic	sql/log.cc	2000-10-05 17:58:16 -06:00
Makefile.am	For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide	2007-01-25 17:51:21 +01:00
my-huge.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-innodb-heavy-4G.cnf.sh	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
my-large.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-medium.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-small.cnf.sh	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
mysql-log-rotate.sh	- small improvement for the logrotate config file (patch found in the SUSE	2005-01-18 17:35:32 +01:00
mysql-multi.server.sh	Changed safe_mysqld -> mysqld_safe	2001-06-28 10:49:16 +03:00
MySQL-shared-compat.spec.sh	support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build.	2007-01-10 00:36:41 +01:00
mysql.server-sys5.sh	Small bug fixes	2000-09-07 04:55:17 +03:00
mysql.server.sh	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341	2007-01-31 16:09:36 -05:00
mysql.spec.sh	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2007-02-03 09:43:38 +01:00
mysqld_multi.server.sh	Added possibility to use [GNR...] optional argument for	2004-10-09 13:57:27 +03:00
ndb-config-2-node.ini.sh	made an .sh file of ndb-config-2-node.ini instead	2005-02-03 17:58:02 +01:00