bzr push into mysql-trunk branch (andrei.elkin:3916 to 3917)

[Andrei Elkin]

 3917 Andrei Elkin	2012-06-28 [merge]
      merge from 5.6 to mysql-trunk.

    modified:
      sql/mysqld.cc
 3916 Andrei Elkin	2012-06-28 [merge]
      merge from 5.6.

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-06-25 09:28:20 +0000
+++ b/sql/mysqld.cc	2012-06-28 17:32:16 +0000
@@ -1692,7 +1692,7 @@ static void mysqld_exit(int exit_code)
    GTID cleanup destroys objects and reset their pointer.
    Function is reentrant.
 */
-inline void gtid_server_cleanup()
+void gtid_server_cleanup()
 {
   delete gtid_state;
   delete global_sid_map;
@@ -1708,7 +1708,7 @@ inline void gtid_server_cleanup()
    @return true if allocation does not succeed
            false if OK
 */
-inline bool gtid_server_init()
+bool gtid_server_init()
 {
   bool res=
     (!(global_sid_lock= new Checkable_rwlock) ||

No bundle (reason: useless for push emails).