unknown 67601f55cb Merge trift2.:/MySQL/M50/mysql-5.0 ...

into  trift2.:/MySQL/M51/mysql-5.1


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.

2007-05-02 14:08:43 +02:00

..

examples

Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508

2007-04-11 09:34:02 +02:00

CMakeLists.txt

Fixed compiler warnings

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

copyright

…

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

Merge trift2.:/MySQL/M50/mysql-5.0

2007-05-02 14:08:43 +02:00

resource.h

query_id and my_xid -> ulonglong

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