Fixed whitespace

Author: marcalff

storage/perfschema/pfs_digest.h

@@ -81,4 +81,4 @@ extern PFS_statements_digest_stat *statements_digest_stat_array;
 extern LF_HASH digest_hash;
 
 #endif
-	
+

storage/perfschema/pfs_events_statements.cc

@@ -106,7 +106,7 @@ int init_events_statements_history_long(uint events_statements_history_long_sizi
 
     events_statements_history_long_array[index].m_sqltext= h_long_stmts_text_array + index * pfs_max_sqltext;
   }
-  
+
   return 0;
 }
 

storage/perfschema/pfs_instr.cc

@@ -1558,7 +1558,7 @@ void aggregate_thread_status(PFS_thread *thread,
     safe_host->aggregate_status_stats(&thd->status_var);
   }
 #if 0
-  else 
+  else
   {
     /* TODO: Requires LOCK_status. global_status_var updated by server on THD disconnect. */
     add_to_status(&global_status_var, &thd->status_var, false);

storage/perfschema/pfs_instr_class.cc

@@ -669,7 +669,7 @@ void PFS_table_share::refresh_setup_object_flags(PFS_thread *thread)
                       m_table_name, m_table_name_length,
                       &m_enabled, &m_timed);
 
-  /* 
+  /*
     If instrumentation for this table was enabled earlier and is disabled now,
     cleanup slots reserved for lock stats and index stats.
   */

storage/perfschema/pfs_server.cc

@@ -309,7 +309,7 @@ void shutdown_performance_schema(void)
     my_set_thread_local(THR_PFS_SBU, NULL); // status_by_user
     my_set_thread_local(THR_PFS_SBH, NULL); // status_by_host
     my_set_thread_local(THR_PFS_SBA, NULL); // status_by_account
-    
+
     my_delete_thread_local_key(THR_PFS);
     my_delete_thread_local_key(THR_PFS_VG);
     my_delete_thread_local_key(THR_PFS_SV);

storage/perfschema/pfs_variable.cc

@@ -37,13 +37,13 @@ bool PFS_system_variable_cache::init_show_var_array(enum_var_type scope)
 {
   DBUG_ASSERT(!m_initialized);
   m_query_scope= scope;
-  
+
   mysql_rwlock_rdlock(&LOCK_system_variables_hash);
   DEBUG_SYNC(m_current_thd, "acquired_LOCK_system_variables_hash");
 
   /* Record the system variable hash version to detect subsequent changes. */
   m_version= get_system_variable_hash_version();
-  
+
   /* Build the SHOW_VAR array from the system variable hash. */
   enumerate_sys_vars(m_current_thd, &m_show_var_array, true, m_query_scope, true);
 
@@ -67,7 +67,7 @@ bool PFS_system_variable_cache::do_initialize_session(void)
 
   /* Build the array. */
   bool ret= init_show_var_array(OPT_SESSION);
-  
+
   mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
@@ -194,7 +194,7 @@ void PFS_system_variable_cache::free_mem_root(void)
 int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
 {
   int ret= 1;
-  
+
   m_pfs_thread= pfs_thread;
   m_materialized= false;
   m_cache.clear();
@@ -208,7 +208,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
   /* Use a temporary mem_root to avoid depleting THD mem_root. */
   if (m_use_mem_root)
     set_mem_root();
-    
+
   /* Get and lock a validated THD from the thread manager. */
   if ((m_safe_thd= get_THD(pfs_thread)) != NULL)
   {
@@ -232,7 +232,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
     m_materialized= true;
     ret= 0;
   }
-  
+
   /* Mark mem_root blocks as free. */
   if (m_use_mem_root)
     clear_mem_root();
@@ -249,7 +249,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
 int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread, uint index)
 {
   int ret= 1;
-  
+
   m_pfs_thread= pfs_thread;
   m_materialized= false;
   m_cache.clear();
@@ -264,7 +264,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread, ui
   if ((m_safe_thd= get_THD(pfs_thread)) != NULL)
   {
     SHOW_VAR *show_var= &m_show_var_array.at(index);
-    
+
     if (show_var && show_var->value &&
         (show_var != m_show_var_array.end()))
     {
@@ -285,7 +285,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread, ui
     m_materialized= true;
     ret= 0;
   }
-  
+
   mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
@@ -662,7 +662,7 @@ bool PFS_status_variable_cache::init_show_var_array(enum_var_type scope)
 
   /* Get the latest version of all_status_vars. */
   m_version= get_status_vars_version();
-  
+
   /* Increase cache size if necessary. */
   m_cache.reserve(m_show_var_array.size());
 
@@ -708,7 +708,7 @@ char * PFS_status_variable_cache::make_show_var_name(const char* prefix, const c
 {
   DBUG_ASSERT(name_buf != NULL);
   char *prefix_end= name_buf;
-  
+
   if (prefix && *prefix)
   {
     /* Drop the prefix into the front of the name buffer. */
@@ -748,7 +748,7 @@ bool PFS_status_variable_cache::do_initialize_session(void)
 
   bool ret= init_show_var_array(OPT_SESSION);
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) 
+  if (m_current_thd->fill_status_recursion_level-- == 1)
     mysql_mutex_unlock(&LOCK_status);
 
   return ret;
@@ -766,7 +766,7 @@ int PFS_status_variable_cache::do_materialize_global(void)
   /* Acquire LOCK_status to guard against plugin load/unload. */
   if (m_current_thd->fill_status_recursion_level++ == 0)
     mysql_mutex_lock(&LOCK_status);
-  
+
   /*
      Build array of SHOW_VARs from global status array. Do this within
      LOCK_status to ensure that the array remains unchanged during
@@ -792,7 +792,7 @@ int PFS_status_variable_cache::do_materialize_global(void)
   */
   manifest(m_current_thd, m_show_var_array.begin(), &status_totals, "", false);
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) 
+  if (m_current_thd->fill_status_recursion_level-- == 1)
     mysql_mutex_unlock(&LOCK_status);
 
   m_materialized= true;
@@ -840,7 +840,7 @@ int PFS_status_variable_cache::do_materialize_session(THD* unsafe_thd)
     ret= 0;
   }
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) 
+  if (m_current_thd->fill_status_recursion_level-- == 1)
     mysql_mutex_unlock(&LOCK_status);
   return ret;
 }
@@ -861,7 +861,7 @@ int PFS_status_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
   /* Acquire LOCK_status to guard against plugin load/unload. */
   if (m_current_thd->fill_status_recursion_level++ == 0)
     mysql_mutex_lock(&LOCK_status);
-   
+
   /* The SHOW_VAR array must be initialized externally. */
   DBUG_ASSERT(m_initialized);
 
@@ -880,8 +880,8 @@ int PFS_status_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
     m_materialized= true;
     ret= 0;
   }
-  
-  if (m_current_thd->fill_status_recursion_level-- == 1) 
+
+  if (m_current_thd->fill_status_recursion_level-- == 1)
     mysql_mutex_unlock(&LOCK_status);
   return ret;
 }
@@ -913,14 +913,14 @@ int PFS_status_variable_cache::do_materialize_client(PFS_client *pfs_client)
     from disconnected threads.
   */
   m_sum_client_status(pfs_client, &status_totals);
-  
+
   /*
     Build the status variable cache using the SHOW_VAR array as a reference and
     the status totals collected from threads associated with this client.
   */
   manifest(m_current_thd, m_show_var_array.begin(), &status_totals, "", false);
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) 
+  if (m_current_thd->fill_status_recursion_level-- == 1)
     mysql_mutex_unlock(&LOCK_status);
 
   m_materialized= true;

storage/perfschema/pfs_variable.h

@@ -30,7 +30,7 @@
   1. INITIALIZE - Build or acquire a sorted list of variables to use for input.
      Use the SHOW_VAR struct as an intermediate format common to system, status
      and user vars:
-     
+
      SHOW_VAR
        Name  - Text string
        Value - Pointer to memory location, function, subarray structure
@@ -45,7 +45,7 @@
      - For status variables, copy existing global status array into a local
        array that can be used without locks. Expand nested subarrays, indicated
        by a type of SHOW_ARRAY.
-     
+
   2. MATERIALIZE - Convert the list of SHOW_VAR variables to string format,
      store in a local cache:
      - Resolve each variable according to the type.
@@ -55,7 +55,7 @@
      - Prefix variable name with the plugin name.
 
   3. OUTPUT - Iterate the cache for the SHOW command or table query.
-  
+
   CLASS OVERVIEW
   --------------
   1. System_variable - A materialized system variable
@@ -200,7 +200,7 @@ class Find_THD_variable : public Find_THD_Impl
     //TODO: filter bg threads?
     if (thd != m_unsafe_thd)
       return false;
-    
+
     /* Hold this lock to keep THD during materialization. */
     mysql_mutex_lock(&thd->LOCK_thd_data);
     return true;
@@ -238,13 +238,13 @@ class PFS_variable_cache
   { }
 
   virtual ~PFS_variable_cache()= 0;
-  
+
   /**
     Build array of SHOW_VARs from the external variable source.
     Filter using session scope.
   */
   bool initialize_session(void);
-  
+
   /**
     Build array of SHOW_VARs suitable for aggregation by user, host or account.
     Filter using session scope.
@@ -379,7 +379,7 @@ class PFS_variable_cache
   virtual int do_materialize_session(PFS_thread *) { return 1; }
   virtual int do_materialize_session(PFS_thread *, uint index) { return 1; }
 
-protected: 
+protected:
   /* Validated THD */
   THD *m_safe_thd;
 

storage/perfschema/table_helper.cc

@@ -780,7 +780,7 @@ void PFS_variable_name_row::make_row(const char* str, size_t length)
 {
   DBUG_ASSERT(length <= sizeof(m_str));
   DBUG_ASSERT(length <= NAME_CHAR_LEN);
-  
+
   m_length= MY_MIN(length, NAME_CHAR_LEN); /* enforce max name length */
   if (m_length > 0)
     memcpy(m_str, str, length);

storage/perfschema/table_session_status.cc

@@ -92,7 +92,7 @@ int table_session_status::rnd_init(bool scan)
     return 0;
 
  /* Build a cache of all status variables for this thread. */
-  m_status_cache.materialize_session(current_thd);   
+  m_status_cache.materialize_session(current_thd);
 
   /* Record the current number of status variables to detect subsequent changes. */
   ulonglong status_version= m_status_cache.get_status_array_version();

storage/perfschema/table_setup_actors.cc

@@ -115,7 +115,7 @@ int table_setup_actors::write_row(TABLE *table, unsigned char *buf,
       }
     }
   }
-  
+
   /* Reject illegal enum values in ENABLED */
   if ((enabled_value != ENUM_YES) && (enabled_value != ENUM_NO))
     return HA_ERR_NO_REFERENCED_ROW;

storage/perfschema/table_status_by_account.h

@@ -131,7 +131,7 @@ class table_status_by_account : public PFS_engine_table
 
   /** Status variable cache for one account. */
   PFS_status_variable_cache m_status_cache;
-  
+
   /** Current row. */
   row_status_by_account m_row;
   /** True if the current row exists. */

storage/perfschema/table_status_by_user.cc

@@ -142,7 +142,7 @@ int table_status_by_user::rnd_next(void)
     threads associated with the user.
   */
   bool has_more_user= true;
-  
+
   for (m_pos.set_at(&m_next_pos);
        has_more_user;
        m_pos.next_user())

storage/perfschema/table_status_by_user.h

@@ -93,7 +93,7 @@ class table_status_by_user_context : public PFS_table_context
 class table_status_by_user : public PFS_engine_table
 {
   typedef pos_status_by_user pos_t;
-  
+
 public:
   /** Table share */
   static PFS_engine_table_share m_share;

storage/perfschema/table_variables_by_thread.cc

@@ -165,7 +165,7 @@ table_variables_by_thread::rnd_pos(const void *pos)
 
   set_position(pos);
   DBUG_ASSERT(m_pos.m_index_1 < global_thread_container.get_row_count());
- 
+
   PFS_thread *pfs_thread= global_thread_container.get(m_pos.m_index_1);
     /*
     Only materialize threads that were previously materialized by rnd_next().