bzr push into mysql-pe branch (gshchepa:3740 to 3741)

[Gleb Shchepa]

 3741 Gleb Shchepa	2009-12-03 [merge]
      manual merge mysql-5.1-bugteam --> mysql-pe

    modified:
      storage/innobase/handler/ha_innodb.cc
 3740 lars-erik.bjork@stripped	2009-12-03 [merge]
      Merging from mysql-5.1-bugteam.
      
      Fixed mysql_upgrade.result because output from upgrade 
      has changed slightly between versions.

    modified:
      client/mysql_upgrade.c
      mysql-test/r/mysql_upgrade.result
      mysql-test/t/mysql_upgrade.test
      scripts/mysql_system_tables_fix.sql
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2009-12-01 11:10:19 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2009-12-03 19:50:03 +0000
@@ -40,12 +40,6 @@ have disabled the InnoDB inlining in thi
 #include "ha_innodb.h"
 #include <mysql/plugin.h>
 
-#ifndef MYSQL_SERVER
-/* This is needed because of Bug #3596.  Let us hope that pthread_mutex_t
-is defined the same in both builds: the MySQL server and the InnoDB plugin. */
-extern pthread_mutex_t LOCK_thread_count;
-#endif /* MYSQL_SERVER */
-
 /** to protect innobase_open_files */
 static pthread_mutex_t innobase_share_mutex;
 /** to force correct commit order in binlog */


Attachment: [text/bzr-bundle] bzr/[e-mail]