bzr commit into mysql-5.1 branch (mikael:2848)

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/cache_alignment/

 2848 Mikael Ronstrom	2009-05-08
      Fixed cache alignment patch
      modified:
        sql/mysqld.cc

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-05-08 13:36:36 +0000
+++ b/sql/mysqld.cc	2009-05-08 13:56:37 +0000
@@ -603,7 +603,18 @@ pthread_key(THD*, THR_THD);
   Ensure that all mutexes and conditions are aligned on 128 byte
   boundaries to avoid false sharing of cachelines.
 */
-#pragma align 128
+#pragma align 128(LOCK_mysql_create_db, LOCK_Acl, LOCK_open, \
+LOCK_thread_count, LOCK_mapped_file, LOCK_status, \
+LOCK_global_read_lock, LOCK_error_log, LOCK_uuid_generator, \
+LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create, \
+LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received, \
+LOCK_global_system_variables, LOCK_user_conn, LOCK_slave_list, \
+LOCK_active_mi, LOCK_connection_count, LOCK_prepared_stmt_count, \
+LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave, \
+LOCK_system_variables_hash, COND_refresh, COND_thread_count, \
+COND_global_read_lock, signal_thread, connection_attrib, \
+LOCK_server_started, COND_server_started)
+
 pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count,
 		LOCK_mapped_file, LOCK_status, LOCK_global_read_lock,
 		LOCK_error_log, LOCK_uuid_generator,
@@ -630,8 +641,6 @@ pthread_t signal_thread;
 pthread_attr_t connection_attrib;
 pthread_mutex_t  LOCK_server_started;
 pthread_cond_t  COND_server_started;
-/* Return to normal aligning scheme again */
-#pragma align(reset)
 
 int mysqld_server_started= 0;