unknown d898972dc0 manual merge ...

BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/events.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged

2006-06-20 17:14:36 +02:00

..

examples

Re-apply missing changeset, orignally pushed by elliot

2006-06-06 14:21:07 +03:00

CMakeLists.txt

Reorganize, physically the events code

2006-06-08 23:07:11 +02:00

copyright

Added all changes from old 4.0 version:

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

emb_qcache.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

emb_qcache.h

Fix crash in embedded server due to incorrect storage of results

2005-03-31 19:17:45 -08:00

embedded_priv.h

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

lib_sql.cc

Remove unused variables and label

2006-04-10 18:34:18 +02:00

libmysqld.c

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

libmysqld.def

Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld

2006-04-11 15:14:08 +02:00

libmysqld.rc

query_id and my_xid -> ulonglong

2005-01-27 22:38:56 +01:00

Makefile.am

manual merge

2006-06-20 17:14:36 +02:00

resource.h

query_id and my_xid -> ulonglong

2005-01-27 22:38:56 +01:00