From: Mikael Ronstrom Date: May 13 2011 1:46pm Subject: bzr commit into mysql-5.5 branch (mikael.ronstrom:3146) List-Archive: http://lists.mysql.com/commits/137325 Message-Id: <201105131347.p4DDleV3013775@dator6> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3244546877653625489==" --===============3244546877653625489== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/mikael/mysql_clones/mysql-5.5-wl5136_community/ based on revid:mikael@dator9-20110513111938-6kni7wod1eutwa3u 3146 Mikael Ronstrom 2011-05-13 Removed variables no longer needed in plugins, moved to methods instead modified: sql/mysqld.cc sql/mysqld.h === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc revid:mikael@dator9-20110513111938-6kni7wod1eutwa3u +++ b/sql/mysqld.cc revid:mikael.ronstrom@stripped @@ -447,7 +447,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; @@ -474,8 +474,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; /* Maximum length of parameter value which can be set through mysql_send_long_data() call. @@ -583,7 +582,7 @@ Le_creator le_creator; MYSQL_FILE *bootstrap_file; int bootstrap_error; -MYSQL_PLUGIN_IMPORT I_List threads; +I_List threads; Rpl_filter* rpl_filter; Rpl_filter* binlog_filter; @@ -632,9 +631,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; @@ -7871,9 +7870,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-20110513111938-6kni7wod1eutwa3u +++ b/sql/mysqld.h revid:mikael.ronstrom@stripped @@ -206,12 +206,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 threads; +extern I_List threads; extern char err_shared_dir[]; extern TYPELIB thread_handling_typelib; extern my_decimal decimal_zero; @@ -267,9 +267,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; @@ -342,7 +340,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; --===============3244546877653625489== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mikael.ronstrom@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mikael.ronstrom@stripped\ # kywygvac56ckbbpa # target_branch: file:///home/mikael/mysql_clones/mysql-5.5-\ # wl5136_community/ # testament_sha1: be03dd334a647d83fb7b8372f9cc3af31b1e9c19 # timestamp: 2011-05-13 15:46:40 +0200 # source_branch: file:///home/mikael/mysql_clones/mysql-5.5/ # base_revision_id: mikael@dator9-20110513111938-6kni7wod1eutwa3u # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdZRahAAAlDfgAAQUGf//15n lAC////wUAVWeS61yLMHVAABKlNqb1CDNQYmgAHpAAAADRA0mmTVPU2yJGQAAGQYgASmkEJkyjQa ZGmgAAaZqGTQHMABMAATAAAAAASSCMpgCNCbQTTRGp6aJ6nqDTTR6kY40IAz9tXYL6vUEeoUuquJ EAZMSqmNq+Ae7HFULJEEOLEeBMSQJM2rQzWINcqMFqlEsVEXtVykmuUJ3QgqlgqckK+ww3uaC/90 mzMZzMvh3ryGyhOPGSo4kzYc9n348TPoUnzQ5kGPG4wOBqKjlwZMBwUlyJ6Wgfcnjw2Eedg7W0Fy EMrRGRZOJsMogUpkhq1YnHEc2xGEiOwy76iooiImVQ3xA0k253PHXTW04jnDSIKGwCEkrWpQM5ni FqHoUiJka95p5njNCtRqVMoZE83FjJHqNMCY6EkCmJ5qJYjIx6w4SyEmVIlSEaLGEERatQKWPkUN JVJJ14xMYhfUYwL/k4iaieGCVg82VnR7njUuMRO4pcTREBlRAHuwkWCDAhY06tbB/ZS0XQ25m5V3 VmoucDPcNXYUa6CLzA7glBBXjQYtSMjlvWLO8lDQGTfpFaJCeaJzWANC6oMFuyCyIPpO8MJ32KSC 2gDIMD62xDZAqiFN8NCXI6U0C3NdIKIGMiyW3VTHEvpCNUFECWSuB07KXSwJFisqkYQp2O8zDG0y tfCoakyyDWSj8G8oLFURvq1qCgPOXS6JDY82OmZ7DGBTbW/CgfUaBFO3ErrnKUqb2kRINaModE88 G2WwUDgo0z4G3MsXAMARgBobieQR5y6cLk48IOeLcb3Fh1k4CDg9TSdWMEMTrEyS1WF5rJbSM/wz bTWPL6NhiN45d07bRSbHEnKAhomTREeMMdjaeweyXYpF8L0Ol453X2p+nwBqsEdsUL3SIMGUUayT Gt+B6ySq7FTZhzBx9ftd9TM+gSroIjyOA2uQG7vt1bwH9hKtSKvU9SQDEv6Pde/uaYya8BwigRdt F8xgxEczxFr6fsYeHum0ffdgEwYraCIIHH5DdtP3KaDqrHE94/5HLIS4cTW6WfEpYX2mQZjG0HJR B9Q1QI1xSIKzTNHnYqMzzK9tyeUjUdwKryY2H3cQD4xVKYNd8sezLx6btOC3KpFKOqsg66VjBg1l 0zIZ8QLhUwfNpCTjB4vLNA0WZSA5Cf2sLTyPAD9FM4i4ll4LAEwTNe+1aIb0mhqToqj45CVQom05 ot6v/7TGNJUDDN2R8FeDyJ2tMzuSXm4DumXhmjzWncbwG/CYStD1a54iB0GFcWiGOTH2jt71fq8e wibJHVRJGlT2d/Z+Ew7mwbuBqNpPXVSqyTo4V7RrGtkM1aDvJFUUMQDkKDoMuq1bHijImPpGSLqB kPYGXkb8q+uRZov1siNoIYQxUgY5nrxTxQ+tCR3jSD2EMi5P6PWyZeOG6h1S3tzcMEFHMhPfwoKc ijnEp3laR4PKTTkytDAZJX9yRjQldbcnzmd2pXEF7EQXoIouzokzB6OmOg0so2hz1BxQxQqW6ng1 BtQTkNXqQyQ1phWEPoxaQ2PPsEGaFz1sDr4FlZWRYGOpPPdtwL0U7SkL0YLAGckScGUQ5pzFPksu uh34FexeQi+BqLVFGZgpHDyWgiYxkdSYGs0M08KtAKrsUF54Adh1lZmNVM1Fh/4u5IpwoSGsotQg --===============3244546877653625489==--