unknown 515c747dcf merge ...

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
libmysqld/Makefile.am:
  Added back md5.c

2001-10-08 05:36:35 +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

conf_to_src.c

Fixed bug in REGEXP for Linux Alpha

2001-04-11 20:19:52 +03:00

configure.in

Import changeset

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

dll.c

Changed to use my_global.h

2001-09-14 02:54:33 +03:00

errmsg.c

Changed to use my_global.h

2001-09-14 02:54:33 +03:00

get_password.c

Changed to use my_global.h

2001-09-14 02:54:33 +03:00

libmysql.c

merge

2001-10-08 05:36:35 +03:00

Makefile.am

Fix for make dist

2001-09-29 15:37:53 +03:00

Makefile.shared

fixes for MYSQL manager

2001-09-19 14:30:43 -06:00

manager.c

forced addition of manager.c

2001-10-03 15:41:38 -06:00

net.c

Fixed some build problems.

2001-10-04 02:44:18 +03:00

password.c

Changed to use my_global.h

2001-09-14 02:54:33 +03:00