bzr push into mysql-trunk branch (bernt.johnsen:5192 to 5193)

[Bernt M. Johnsen]

 5193 Bernt M. Johnsen	2012-12-10
      WL6587 --disconnect-on-expired-passwords tests can't be runn in embeeded mode

    modified:
      mysql-test/t/disconnect_on_expired_password_default.test
      mysql-test/t/disconnect_on_expired_password_off.test
 5192 Marko Mäkelä	2012-12-10 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0upd.cc
=== modified file 'mysql-test/t/disconnect_on_expired_password_default.test'
--- a/mysql-test/t/disconnect_on_expired_password_default.test	2012-12-07 16:14:55 +0000
+++ b/mysql-test/t/disconnect_on_expired_password_default.test	2012-12-10 08:39:32 +0000
@@ -1,4 +1,6 @@
 ## WL6587 Test --disconnect-on-expired-passwords=default (on)
+--source include/not_embedded.inc
+
 SHOW VARIABLES LIKE 'disconnect_on_expired_password';
 
 --echo ## Test mysql client in non-interactrive mode

=== modified file 'mysql-test/t/disconnect_on_expired_password_off.test'
--- a/mysql-test/t/disconnect_on_expired_password_off.test	2012-12-07 16:14:55 +0000
+++ b/mysql-test/t/disconnect_on_expired_password_off.test	2012-12-10 08:39:32 +0000
@@ -1,4 +1,5 @@
 ## WL6587 Test --disconnect-on-expired-password=off
+--source include/not_embedded.inc
 
 SHOW VARIABLES LIKE 'disconnect_on_expired_password';
 

No bundle (reason: useless for push emails).