unknown d32bdcb1bf merge with 4.0.15 ...

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

2003-09-11 20:24:14 +03:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

acinclude.m4

Import changeset

2000-07-31 21:29:14 +02:00

client_settings.h

Last part of resolving conflicts after pull

2003-06-18 10:34:09 +05:00

conf_to_src.c

Update copyright

2001-12-06 14:10:51 +02:00

dll.c

Add detection of in_addr_t

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

errmsg.c

merge with 4.0.15

2003-08-29 13:44:35 +03:00

get_password.c

fixed bug #1174

2003-09-02 12:09:27 -04:00

libmysql.c

After merge fixes.

2003-09-11 19:06:23 +03:00

libmysql.def

implementation of mysql_stmt_reset client end

2003-07-08 02:27:21 -07:00

Makefile.am

merge with 4.0.15

2003-08-29 13:44:35 +03:00

Makefile.shared

merge with 4.0.15

2003-08-29 13:44:35 +03:00

manager.c

Merge with 4.0.11

2003-02-04 21:52:14 +02:00