mariadb/libmysqld
unknown 7248ab7b59 Resolving conflicts
BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_client.cc:
  Auto merged
include/mysql.h:
  Merging (prolly it's the mistake)
libmysqld/libmysqld.c:
  This code seems to be unnecessary
2003-07-04 13:21:14 +05:00
..
examples SCRUM 2003-06-17 21:32:31 +05:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
embedded_priv.h SCRUM 2003-06-19 16:38:21 +05:00
lib_sql.cc SCRUM 2003-06-19 16:38:21 +05:00
libmysqld.c Resolving conflicts 2003-07-04 13:21:14 +05:00
libmysqld.def Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
Makefile.am SCRUM 2003-06-17 21:32:31 +05:00