bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4909 to 4910)

[Frazer Clement]

 4910 Frazer Clement	2012-03-29
      Fix funcs_1.is_columns_mysql testcase to reflect new ndb_binlog_index columns

    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
 4909 Frazer Clement	2012-03-29
      Attempt testcase stability fix for ndb_binlog_index

    modified:
      mysql-test/suite/ndb_binlog/t/ndb_binlog_index.test
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2010-10-06 10:06:47 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2012-03-29 14:30:27 +0000
@@ -102,6 +102,8 @@ NULL	mysql	ndb_binlog_index	epoch	3	NULL
 NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		Default	Default
 NULL	mysql	ndb_binlog_index	gci	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references		Default	Default
 NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references		Default	Default
+NULL	mysql	ndb_binlog_index	next_file	12	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		Default	Default
+NULL	mysql	ndb_binlog_index	next_position	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references		Default	Default
 NULL	mysql	ndb_binlog_index	orig_epoch	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references		Default	Default
 NULL	mysql	ndb_binlog_index	orig_server_id	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references		Default	Default
 NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references		Default	Default
@@ -392,6 +394,8 @@ NULL	mysql	ndb_binlog_index	schemaops	in
 NULL	mysql	ndb_binlog_index	orig_server_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	ndb_binlog_index	orig_epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	ndb_binlog_index	gci	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	ndb_binlog_index	next_position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	ndb_binlog_index	next_file	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
 3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)

No bundle (reason: useless for push emails).