bzr push into mysql-trunk-cluster branch (ole.john.aske:3426 to 3427)

[Ole John Aske]

 3427 Ole John Aske	2012-01-06
      Accepted more changed resultfiles after merge into mysql-trunk-cluster:
     @ mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
        Accept slightly extended information schema contents in 5.6 vs 5.5
     @ mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result
        Accept new warning added in 5.6 when passwords are sent in plain text.

    modified:
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result
 3426 Ole John Aske	2012-01-06
      Accept new result is 'information schema' test as some datatypes in 
      table mysql.ndb_binlog_index has changed.

    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2011-05-30 21:13:02 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2012-01-06 13:43:48 +0000
@@ -1,16 +1,16 @@
 select * from information_schema.columns
 where table_name = "t1";
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-def	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)	PRI		#	
-def	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			#	
-def	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			#	
-def	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			#	
-def	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			#	
-def	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			#	
-def	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			#	
-def	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			#	
-def	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			#	
-def	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			#	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+def	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(6)	PRI	#	select,insert,update,references	
+def	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)		#	select,insert,update,references	
+def	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)		#	select,insert,update,references	
+def	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)		#	select,insert,update,references	
+def	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	NULL	decimal(5,1)		#	select,insert,update,references	
+def	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	0	NULL	NULL	time		#	select,insert,update,references	
+def	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	NULL	date		#	select,insert,update,references	
+def	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime		#	select,insert,update,references	
+def	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)		#	select,insert,update,references	
+def	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob		#	select,insert,update,references	
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result	2011-11-21 12:53:01 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result	2012-01-06 13:43:48 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 show variables like 'slave_allow_batching';
 Variable_name	Value

No bundle (reason: useless for push emails).