bzr push into mysql-trunk branch (bernt.johnsen:5207 to 5208) WL#6587

[Bernt M. Johnsen]

 5208 Bernt M. Johnsen	2012-12-11
      WL#6587 Two tests were not working to windows

    modified:
      mysql-test/t/disconnect_on_expired_password_default.test
      mysql-test/t/disconnect_on_expired_password_off.test
 5207 Vasil Dimov	2012-12-11 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb_i_s_innodb_locks.result
      mysql-test/suite/innodb/t/innodb-index-online.test
      storage/innobase/handler/i_s.cc
=== modified file 'mysql-test/t/disconnect_on_expired_password_default.test'
--- a/mysql-test/t/disconnect_on_expired_password_default.test	2012-12-10 08:39:32 +0000
+++ b/mysql-test/t/disconnect_on_expired_password_default.test	2012-12-11 11:54:03 +0000
@@ -43,8 +43,8 @@ ALTER USER 'bernt' PASSWORD EXPIRE;
 --echo # Doing something should not connect
 --replace_result $MYSQLADMIN MYSQLADMIN
 --error 1
---exec $MYSQLADMIN --socket=$MASTER_MYSOCK --user=bernt --password=secret reload 2>&1
+--exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT --user=bernt --password=secret reload 2>&1
 --echo # Setting password should succeed
---exec $MYSQLADMIN --user=bernt --password=secret --socket=$MASTER_MYSOCK password newsecret 2>&1
+--exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret 2>&1
 
 DROP USER 'bernt';

=== modified file 'mysql-test/t/disconnect_on_expired_password_off.test'
--- a/mysql-test/t/disconnect_on_expired_password_off.test	2012-12-10 08:39:32 +0000
+++ b/mysql-test/t/disconnect_on_expired_password_off.test	2012-12-11 11:54:03 +0000
@@ -41,8 +41,8 @@ ALTER USER 'bernt' PASSWORD EXPIRE;
 --echo # Doing something should connect but fail
 --replace_result $MYSQLADMIN MYSQLADMIN
 --error 1
---exec $MYSQLADMIN --user=bernt --password=secret --socket=$MASTER_MYSOCK reload 2>&1
+--exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT reload 2>&1
 --echo # Setting password should succeed
---exec $MYSQLADMIN --user=bernt --password=secret --socket=$MASTER_MYSOCK password newsecret 2>&1
+--exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret 2>&1
 
 DROP USER 'bernt';

No bundle (reason: useless for push emails).