Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/table.cc:
  Auto merged

mysql-test/mysql-test-run.sh

@@ -392,6 +392,7 @@ start_slave()
       master_info="--master-user=root \
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
+	    --master-password= \
 	    --master-port=$MASTER_MYPORT \
 	    --server-id=2"
    else

mysql-test/t/rpl000017-slave.sh

@@ -2,8 +2,8 @@ cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF
 master-bin.001
 4
 127.0.0.1
-root
-
+replicate
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 9306
 1
 EOF

mysql-test/t/rpl000017.test

@@ -2,6 +2,8 @@ connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0,mysql-slave.sock);
 connection master;
 reset master;
+grant file on *.* to replicate@localhost identified by
+ 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
 connection slave;
 slave start;
 connection master;