mariadb/libmysqld
unknown 7b2e06b281 Lots of conflicts resolved
libmysqld/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
libmysql/libmysql.c:
  Resolved conflicts
sql/mini_client.cc:
  resolved conflicts
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-28 13:54:58 +05:00
..
examples Merge with 4.0 2003-04-03 21:19:12 +03:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
embedded_priv.h Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
lib_sql.cc Fix reference to not initialized memory 2003-04-30 10:15:09 +03:00
lib_vio.c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
libmysqld.c Merge with 4.0.13 2003-05-19 16:35:49 +03:00
libmysqld.def Removed mysql_ssl_clear() 2002-06-27 11:27:04 +03:00
Makefile.am Lots of conflicts resolved 2003-05-28 13:54:58 +05:00