unknown d4e6d4b2c1 Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel ...

into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel


BitKeeper/etc/ignore:
  auto-union
libmysql/libmysql.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge from 5.0
storage/innobase/handler/ha_innodb.cc:
  Manual merge from 5.0

2007-07-06 13:49:15 +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

client_settings.h

Embedded Server doesn't build on Windows.

2007-06-15 14:32:16 -04:00

CMakeLists.txt

bug#28358 libmysql.dll cannot be dynamically loaded on Windows

2007-05-14 13:20:18 +02:00

conf_to_src.c

manually merged

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

dll.c

Final patch to remove the last of the OS2 support.

2006-04-15 18:17:32 -07:00

errmsg.c

Added more descriptive error message of why statement was automaticly dropped

2007-04-13 01:56:22 +03:00

get_password.c

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

libmysql.c

Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel

2007-07-06 13:49:15 +03:00

libmysql.def

Fixed compiler warnings

2007-02-23 13:13:55 +02:00

libmysql.ver.in

BUG#3074: Unversioned symbols in shared library

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

Makefile.am

Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit

2007-03-27 23:56:48 +02:00

Makefile.shared

Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit

2007-03-27 23:56:48 +02:00

manager.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mytest.c

make dist changes for Cmake build

2006-09-01 10:32:12 +02:00