unknown 7b0069ee20 merged ...

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged

2004-11-20 18:36:41 +01:00

..

check_var_limit.inc

Add detection of in_addr_t

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

ctype_common.inc

Incorrect response with partial utf8 index

2004-11-19 14:25:25 +04: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_csv.inc

This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.

2004-08-12 20:57:18 -07:00

have_debug.inc

Robustness feature.

2004-06-20 19:11:02 +02:00

have_exampledb.inc

Adding test cases for the example storage engine (so that you can test to see if it was built correctly).

2004-08-13 17:14:36 -07: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

fix for some build/test errors for 4.1.6

2004-10-13 00:38:43 +00: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

A lot of fixes for prepared statements (PS):

2004-10-26 19:30:01 +03: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

ps_conv.inc

A lot of fixes for prepared statements (PS):

2004-10-26 19:30:01 +03:00

ps_create.inc

Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest

2004-09-25 19:08:02 +04:00

ps_modify1.inc

Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest

2004-09-25 19:08:02 +04:00

ps_modify.inc

Merge with 4.1 to get in latest bug fixes

2004-11-04 15:06:24 +02:00

ps_query.inc

another order by fix for ndb

2004-10-11 20:58:48 +00:00

ps_renew.inc

Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest

2004-09-25 19:08:02 +04:00

system_db_struct.inc

fixed BUG #2874 "Grant table bug" and

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