unknown 71af8ca9bf Ugly merge of 3.23 changes into 4.0 - fix up needed ...

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
myisam/mi_search.c:
  the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards

2001-04-11 19:09:00 -06: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

Import changeset

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

errmsg.c

Changed --replace to --replace_result in mysqltest

2001-02-15 03:43:14 +02:00

get_password.c

Import changeset

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

libmysql.c

Merged some functions and removed some unused client functions.

2001-03-06 15:24:08 +02:00

Makefile.am

Use INSTALL_DATA instead of cp.

2001-02-01 20:49:04 -05:00

Makefile.shared

got --with-other-libc to work, finally

2001-04-02 19:01:15 -06:00

net.c

Added all changes from old 4.0 version:

2001-04-11 13:04:03 +02:00

password.c

Import changeset

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

violite.c

Update to new vio

2000-12-31 12:47:29 +02:00