hf@deer.(none) e5428b2fe9 Lots of conflicts resolved

2003-05-28 13:54:58 +05: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

Update copyright

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

dll.c

Update copyright

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

errmsg.c

Fix typo - un supported -> unsupported

2003-01-31 10:15:45 -08:00

get_password.c

Change dbug.h -> my_dbug.h (Portability fix)

2003-03-17 19:06:14 +02:00

libmysql.c

Lots of conflicts resolved

2003-05-28 13:54:58 +05:00

libmysql.def

merge

2003-05-22 02:57:27 +03:00

Makefile.am

SCRUM

2003-04-23 19:37:33 +05:00

Makefile.shared

UCS2 and UTF8 are in separate files now

2003-05-21 15:29:44 +05:00

manager.c

Merge with 4.0.11

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