unknown 07302c6007 Merge ...

VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged

2006-04-04 23:37:44 +02: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

Fixed Bug#7838, "pipe_sig_handler should be static".

2005-02-17 23:00:48 +02:00

cmakelists.txt

Some changes to make it possible to build for Windows with CMake from

2006-03-24 22:50:56 +01:00

conf_to_src.c

manually merged

2004-08-18 19:57:55 +02:00

dll.c

manually merged

2004-08-18 19:57:55 +02:00

errmsg.c

A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"

2005-05-16 18:27:21 +04:00

get_password.c

- rename: EXCEPTIONS->EXCEPTIONS-CLIENT

2004-08-05 17:05:11 +02:00

libmysql.c

fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163)

2006-03-21 22:02:36 +01:00

libmysql.def

fixed two bugs that break Windows build

2005-07-29 15:40:39 +02:00

libmysql.ver.in

BUG#3074: Unversioned symbols in shared library

2006-01-17 18:51:08 +04:00

Makefile.am

Merge

2006-04-04 23:37:44 +02:00

Makefile.shared

Merge mysql.com:/opt/local/work/mysql-4.1-root

2006-01-18 15:15:09 +03:00

manager.c

A fix (bug #6057: Data Type Problem in manager.c).

2004-10-18 12:43:52 +05:00

mytest.c

Some changes to make it possible to build for Windows with CMake from

2006-03-24 22:50:56 +01:00