Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

into  mysql.com:/home/hf/work/29878/my51-29878

mysql-test/suite/rpl/r/rpl_session_var.result

@@ -47,7 +47,7 @@ CREATE TABLE t1 (
 PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM;
 INSERT INTO t1(data) VALUES(SESSION_USER());
-SELECT * FROM t1;
-id	data
+SELECT length(data) < 100 FROM t1;
+length(data) < 100
 1
 drop table t1;

mysql-test/suite/rpl/t/rpl_session_var.test

@@ -56,7 +56,7 @@ INSERT INTO t1(data) VALUES(SESSION_USER());
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM t1;
+SELECT length(data) < 100 FROM t1;
 connection master;
 drop table t1;
 save_master_pos;