unknown 832dd46f49 Automerge ...

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged

2006-02-15 00:01:46 +01: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

Automerge

2006-02-15 00:01:46 +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

Include libyassl.la and libtaocrypt.la in libmysqlclient.la

2005-11-28 16:28:00 +01: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