unknown dfd93a8f96 manual merge ...

libmysqld/lib_sql.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  merge

2007-03-09 16:06:08 +01:00

..

examples

Fixed compilations problems and warnings on windows

2007-02-23 22:48:15 +02:00

CMakeLists.txt

Fixed compiler warnings

2007-02-23 13:13:55 +02:00

copyright

Added all changes from old 4.0 version:

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

emb_qcache.cc

Many files:

2006-12-23 20:17:15 +01:00

emb_qcache.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

embedded_priv.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

lib_sql.cc

manual merge

2007-03-09 16:06:08 +01:00

libmysqld.c

Many files:

2006-12-23 20:17:15 +01:00

libmysqld.def

Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2

2006-09-06 18:27:26 +02:00

libmysqld.rc

query_id and my_xid -> ulonglong

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

Makefile.am

Fixed compiler warnings

2007-02-23 13:13:55 +02:00

resource.h

query_id and my_xid -> ulonglong

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