unknown 5fa6e3c557 Merge mysql.com:/usr/home/bar/mysql-4.1.b10201 ...

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
include/config-netware.h:
  auto merge fix
libmysql/libmysql.def:
  after merge fix
sql/item_func.cc:
  SCCS merged

2005-07-26 13:25:18 +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

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

2005-02-17 23:00:48 +02: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

Merge mysql.com:/home/jimw/my/mysql-5.0-5906

2005-07-19 19:59:34 -07:00

libmysql.def

Merge mysql.com:/usr/home/bar/mysql-4.1.b10201

2005-07-26 13:25:18 +05:00

Makefile.am

Makefile.am:

2005-07-05 23:24:48 +02:00

Makefile.shared

Cleanups during review

2005-07-18 15:33:18 +03:00

manager.c

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

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