Luis Soares 6f3e97a6cb BUG#11762616: BUG#55229: 'POSTION' ... Manual merge from mysql-5.1 into mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in sql/handler.h Text conflict in storage/archive/ha_archive.cc		2011-05-06 00:50:31 +01:00
..
bin
config	Merge	2010-12-29 01:26:31 +01:00
demos
docs	Merge	2010-12-29 01:26:31 +01:00
include	Backport fixes for some of the more noise compiler warnings in ndb.	2010-07-24 09:54:27 -03:00
lib
ndbapi-examples	wait_until_ready may return greater that 1 since wait time for second node to connect is 0	2007-07-25 07:22:28 +02:00
src	BUG#11762616: BUG#55229: 'POSTION'	2011-05-06 00:50:31 +01:00
test	BUG#57953 my_load_defaults return junk argument ----args-separator---- to caller	2011-01-17 15:44:37 +08:00
tools	Merge	2010-12-29 01:26:31 +01:00
MAINTAINERS	[PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples	2007-06-13 23:53:01 +10:00
Makefile.am	Merge	2010-12-29 01:26:31 +01:00
ndb_configure.m4	Bug#56397 The version of NDB in MySQL Server should be constant	2010-10-07 11:13:30 +02:00
plug.in	WL#5503 SEAGULL: Move config/ac-macros/ha_ndbcluster.m4 to storage/ndb/	2010-10-07 11:02:16 +02:00