bzr push into mysql-6.0-codebase-bugfixing branch (tor.didriksen:3826 to 3827) Bug#52755

[Tor Didriksen]

 3827 Tor Didriksen	2010-04-14
      Bug #52755  	Compilation error when compiling my_init.c without CMake
      
      Cleanup inclusion of my_pthread.h and my_sys.h

    modified:
      include/my_bitmap.h
      include/my_sys.h
      include/mysql/psi/mysql_file.h
      sql/ha_ndbcluster_connection.cc
      sql/ha_ndbcluster_connection.h
      storage/perfschema/unittest/pfs_timer-t.cc
 3826 Jon Olav Hauglid	2010-04-21 [merge]
      manual merge from mysql-next-mr-bugfixing

    modified:
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/lock_sync.result
      mysql-test/r/myisam.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-lock.result
      mysql-test/r/sp_sync.result
      mysql-test/t/disabled.def
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/lock_sync.test
      mysql-test/t/myisam.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-lock.test
      mysql-test/t/sp_sync.test
      sql/event_scheduler.cc
      sql/handler.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_update.cc
      sql/sys_vars.cc
      storage/myisam/ha_myisam.h
=== modified file 'include/my_bitmap.h'
--- a/include/my_bitmap.h	2010-04-08 10:50:40 +0000
+++ b/include/my_bitmap.h	2010-04-14 12:49:42 +0000
@@ -19,7 +19,9 @@
 #define MY_BIT_NONE (~(uint) 0)
 
 #include <m_string.h>
+#ifdef THREAD
 #include <my_pthread.h>
+#endif
 
 typedef uint32 my_bitmap_map;
 

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2010-04-08 15:48:00 +0000
+++ b/include/my_sys.h	2010-04-14 12:49:42 +0000
@@ -1089,7 +1089,6 @@ void netware_reg_user(const char *ip, co
 		      const char *application);
 #endif
 
-#include <my_pthread.h>
 #include <mysql/psi/psi.h>
 
 #ifdef HAVE_PSI_INTERFACE

=== modified file 'include/mysql/psi/mysql_file.h'
--- a/include/mysql/psi/mysql_file.h	2010-04-08 17:42:14 +0000
+++ b/include/mysql/psi/mysql_file.h	2010-04-14 12:49:42 +0000
@@ -39,7 +39,6 @@
   the dependency on my_sys already exists.
 */
 
-#include "my_pthread.h"
 #include "mysql/psi/psi.h"
 
 /**

=== modified file 'sql/ha_ndbcluster_connection.cc'
--- a/sql/ha_ndbcluster_connection.cc	2010-04-09 08:22:10 +0000
+++ b/sql/ha_ndbcluster_connection.cc	2010-04-14 12:49:42 +0000
@@ -20,6 +20,8 @@
 
 #include "my_global.h"
 #include "sql_priv.h"
+#include "my_sys.h"
+#include "log.h"
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #include <ndbapi/NdbApi.hpp>
@@ -32,6 +34,11 @@ static uint g_ndb_cluster_connection_poo
 static ulong g_ndb_cluster_connection_pool_pos= 0;
 static pthread_mutex_t g_ndb_cluster_connection_pool_mutex;
 
+void do_retry_sleep(unsigned milli_sleep)
+{
+  my_sleep(1000*(milli_sleep + 5*(rand()%(milli_sleep/5))));
+}
+
 int ndbcluster_connect(int (*connect_callback)(void),
                        ulong wait_connected,
                        uint connection_pool_size,

=== modified file 'sql/ha_ndbcluster_connection.h'
--- a/sql/ha_ndbcluster_connection.h	2009-12-24 16:38:19 +0000
+++ b/sql/ha_ndbcluster_connection.h	2010-04-14 12:49:42 +0000
@@ -30,9 +30,6 @@ void ndb_set_latest_trans_gci(ulonglong 
 int ndb_has_node_id(uint id);
 
 /* perform random sleep in the range milli_sleep to 2*milli_sleep */
-inline void do_retry_sleep(unsigned milli_sleep)
-{
-  my_sleep(1000*(milli_sleep + 5*(rand()%(milli_sleep/5))));
-}
+void do_retry_sleep(unsigned milli_sleep);
 
 #endif /* HA_NDBCLUSTER_CONNECTION_INCLUDED */

=== modified file 'storage/perfschema/unittest/pfs_timer-t.cc'
--- a/storage/perfschema/unittest/pfs_timer-t.cc	2010-04-09 08:22:10 +0000
+++ b/storage/perfschema/unittest/pfs_timer-t.cc	2010-04-14 12:49:42 +0000
@@ -14,6 +14,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
+#include <my_sys.h>
 #include <sql_priv.h>
 #include <pfs_timer.h>
 #include <tap.h>


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