unknown c06f995ba7 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel ...

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

2006-12-01 13:02:54 +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

CMakeLists.txt

Additional files for cmake support

2006-08-31 19:52:42 +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

Added some missing DBUG_RETURN

2006-11-23 16:41:21 +02:00

get_password.c

- rename: EXCEPTIONS->EXCEPTIONS-CLIENT

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

libmysql.c

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

2006-12-01 13:02:54 +01:00

libmysql.def

Backport fix for mysql client not using SSl library directly

2006-04-22 00:48:13 +02:00

libmysql.ver.in

BUG#3074: Unversioned symbols in shared library

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

Makefile.am

make dist changes for Cmake build

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

Makefile.shared

ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:

2006-11-27 21:15:25 +01:00

manager.c

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

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

mytest.c

make dist changes for Cmake build

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