Alexander Nozdrin a2259d8487 Manual merge from mysql-trunk-merge. ...

Conflicts:
  - storage/archive/ha_archive.cc

2010-01-28 01:13:10 +03:00

..

debugger

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb

2007-06-14 19:57:50 +08:00

editline

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

kernel

Bug #33544 UDF_INIT member decimals initialized wrong with

2009-11-11 21:19:41 +01:00

logger

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

mgmapi

Fix for a few assorted compiler warnings.

2009-08-28 12:06:59 -03:00

mgmcommon

[PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts

2007-03-22 22:35:31 +11:00

ndbapi

Apply patch on behalf of the NDB team:

2010-01-20 22:21:18 -02:00

newtonapi

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

portlib

Use sun_prefetch_read_many() and friends, instead of sparc_prefetch_read_many(),

2009-01-28 22:17:20 +01:00

transporter

Merge mysql.com:/home/my/mysql-5.0

2007-01-27 03:46:45 +02:00

util

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

2008-01-23 10:28:30 +01:00

Makefile.am

Makefile.am:

2007-06-14 12:57:32 +02:00

ndb_constants.h

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user

2007-03-23 14:06:00 +01:00

ndb_global.h.in

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca

2007-06-05 18:00:42 +02:00

ndb_init.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

ndb_net.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ndb_types.h.in

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

ndb_version.h.in

ndb_version.h.in : Fix a syntax error (variable declaration came too late).

2008-02-05 15:24:41 +01:00