unknown 29bae7b7b7 merge ...

BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
Docs/manual.texi:
  Bad merge.
include/mysqld_error.h:
  Merge with 3.23

2001-11-03 22:28:16 +02:00

..

examples

Add --without-isam configure switch.

2001-10-09 18:11:44 -04:00

copyright

Added all changes from old 4.0 version:

2001-04-11 13:04:03 +02:00

embedded_priv.h

Cleaned up SSL documentation

2001-10-02 05:53:00 +03:00

lib_load.cc

Embedded mysql fixes.

2001-08-10 12:37:36 -04:00

lib_sql.cc

Added STDCALL to mysql_sever and mysql_thread variables

2001-11-03 21:33:11 +02:00

lib_vio.c

One should not only have to include my_net.h to work with sockets.

2001-10-09 03:35:29 +03:00

libmysqld.c

merge

2001-10-08 05:36:35 +03:00

Makefile.am

Add sql/mf_iocache.cc to libmysqld sources list.

2001-10-29 12:37:32 -05:00

WHITEPAPER

Added all changes from old 4.0 version:

2001-04-11 13:04:03 +02:00