unknown 895efc07ac Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 ...

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

2004-06-05 10:43:22 -07:00

..

check_var_limit.inc

Add detection of in_addr_t

2003-08-28 06:08:17 +03:00

have_archive.inc

Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses.

2004-05-25 13:27:01 -07:00

have_bdb.inc

changes to make things work in the max version

2001-10-04 15:42:25 -06:00

have_big5.inc

"like" did not work in some cases with character set big5

2003-12-24 16:59:48 +04:00

have_compress.inc

added compress/uncompress function

2003-04-09 20:50:30 -04:00

have_crypt.inc

Fixes for Netware

2003-01-28 08:38:28 +02:00

have_geometry.inc

WL#1163 (Make spatial code separable for other parts)

2004-05-27 20:31:30 +05:00

have_innodb.inc

changes to make things work in the max version

2001-10-04 15:42:25 -06:00

have_isam.inc

Cleanup after last merge

2001-10-08 07:24:04 +03:00

have_ndb.inc

Updated mysql-test-run to work with the started NDB Cluster

2004-04-15 12:03:13 +02:00

have_openssl_1.inc

Openssl test

2003-03-11 13:41:53 +04:00

have_openssl.inc

changes to make things work in the max version

2001-10-04 15:42:25 -06:00

have_query_cache.inc

added building without query cache

2002-03-22 22:55:08 +02:00

have_sjis.inc

#3290: Can't convert sjis&ujis half-width katakana correctly

2004-03-25 14:29:56 +04:00

have_tis620.inc

Bug 1552:

2003-12-25 20:11:01 +04:00

have_ucs2.inc

Character set sets now check if required non-dynamic charsets were really compiled

2003-05-23 15:10:05 +05:00

have_ujis.inc

Character set sets now check if required non-dynamic charsets were really compiled

2003-05-23 15:10:05 +05:00

master-slave.inc

Do not give an error when the user does START SLAVE on an already

2003-03-03 23:12:17 +01:00

not_embedded.inc

After merge fixes

2003-05-21 21:39:58 +03:00

system_db_struct.inc

fixed BUG #2874 "Grant table bug" and

2004-03-10 22:54:07 +04:00