unknown 46cb15ccd4 SCRUM ...

merged conflicts about my previous commit
it seems there are some errors left - gonna check...


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
include/sql_common.h:
  Auto merged
include/mysql.h:
  conflicts merged
libmysql/client_settings.h:
  conflicts merged
libmysql/libmysql.c:
  conflicts merged
sql-common/client.c:
  conflicts merged
sql/client_settings.h:
  conflicts merged
sql/protocol.cc:
  conflict merged

2003-06-17 21:53:13 +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

client_settings.h

SCRUM

2003-06-17 21:53:13 +05: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

SCRUM

2003-06-17 21:53:13 +05:00

libmysql.def

1. Portability fixups for Connector/ODBC 3.52 & DBD

2003-06-04 00:17:48 -07:00

Makefile.am

SCRUM:

2003-05-31 15:15:46 +05:00

Makefile.shared

SCRUM:

2003-05-31 15:15:46 +05:00

manager.c

Merge with 4.0.11

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