mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-10-30 04:26:45 +03:00

Files

unknown 2d8e733dd3 Merge mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-ndb_load.result:
  Auto merged
BitKeeper/deleted/.del-ndb_load.test:
  Auto merged
mysql-test/t/disabled.def:
  Resolve conflict

2006-02-15 12:06:20 -08: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