From: Mikael Ronstrom
Date: May 13 2011 2:11pm
Subject: bzr commit into mysql-trunk branch (mikael.ronstrom:3371)
List-Archive: http://lists.mysql.com/commits/137334
Message-Id: <201105131412.p4DECkDl027571@dator6>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/mikael/mysql_clones/mysql-trunk-wl5136_community/ based on revid:mikael@dator9-20110513124707-j2f9syad56nr0fqo

 3371 Mikael Ronstrom	2011-05-13 [merge]
      merge

    modified:
      sql/mysqld.cc
      sql/mysqld.h
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	revid:mikael@dator9-20110513124707-j2f9syad56nr0fqo
+++ b/sql/mysqld.cc	revid:mikael.ronstrom@stripped
@@ -446,7 +446,7 @@ uint lower_case_table_names;
 ulong tc_heuristic_recover= 0;
 uint volatile thread_count;
 int32 thread_running;
-MYSQL_PLUGIN_IMPORT ulong thread_created;
+ulong thread_created;
 ulong back_log, connect_timeout, concurrency, server_id;
 ulong table_cache_size, table_def_size;
 ulong what_to_log;
@@ -473,8 +473,7 @@ ulong delayed_insert_errors,flush_time;
 ulong specialflag=0;
 ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
 ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
-MYSQL_PLUGIN_IMPORT ulong max_connections;
-ulong max_connect_errors;
+ulong max_connections, max_connect_errors;
 /**
   Limit of the total number of prepared statements in the server.
   Is necessary to protect the server against out-of-memory attacks.
@@ -578,7 +577,7 @@ Le_creator le_creator;
 MYSQL_FILE *bootstrap_file;
 int bootstrap_error;
 
-MYSQL_PLUGIN_IMPORT I_List<THD> threads;
+I_List<THD> threads;
 Rpl_filter* rpl_filter;
 Rpl_filter* binlog_filter;
 
@@ -627,9 +626,9 @@ mysql_mutex_t LOCK_des_key_file;
 #endif
 mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
 mysql_rwlock_t LOCK_system_variables_hash;
-MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
+mysql_cond_t COND_thread_count;
 pthread_t signal_thread;
-MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
+pthread_attr_t connection_attrib;
 mysql_mutex_t LOCK_server_started;
 mysql_cond_t COND_server_started;
 
@@ -8269,9 +8268,7 @@ static PSI_cond_info all_server_conds[]=
 
 PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
   key_thread_handle_manager, key_thread_main,
-  key_thread_signal_hand;
-
-MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
+  key_thread_one_connection, key_thread_signal_hand;
 
 static PSI_thread_info all_server_threads[]=
 {

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	revid:mikael@dator9-20110513124707-j2f9syad56nr0fqo
+++ b/sql/mysqld.h	revid:mikael.ronstrom@stripped
@@ -221,12 +221,12 @@ extern struct my_option my_long_options[
 extern int mysqld_server_started;
 extern "C" MYSQL_PLUGIN_IMPORT int orig_argc;
 extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;
-extern MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
+extern pthread_attr_t connection_attrib;
 extern MYSQL_FILE *bootstrap_file;
 extern my_bool old_mode;
 extern LEX_STRING opt_init_connect, opt_init_slave;
 extern int bootstrap_error;
-extern MYSQL_PLUGIN_IMPORT I_List<THD> threads;
+extern I_List<THD> threads;
 extern char err_shared_dir[];
 extern TYPELIB thread_handling_typelib;
 extern my_decimal decimal_zero;
@@ -286,9 +286,7 @@ extern PSI_cond_key key_RELAYLOG_update_
 
 extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
   key_thread_handle_manager, key_thread_kill_server, key_thread_main,
-  key_thread_signal_hand;
-
-extern MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
+  key_thread_one_connection, key_thread_signal_hand;
 
 #ifdef HAVE_MMAP
 extern PSI_file_key key_file_map;
@@ -466,7 +464,7 @@ extern mysql_mutex_t LOCK_server_started
 extern mysql_cond_t COND_server_started;
 extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
 extern mysql_rwlock_t LOCK_system_variables_hash;
-extern MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
+extern mysql_cond_t COND_thread_count;
 extern mysql_cond_t COND_manager;
 extern int32 thread_running;
 extern my_atomic_rwlock_t thread_running_lock;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).