Merge branch 'mysql-5.6' into mysql-5.7

Author: harinvadodaria

plugin/connection_control/connection_control.cc

@@ -62,10 +62,10 @@ MYSQL_PLUGIN connection_control_plugin_info= 0;
   For connection event, notify Connection_event_coordinator
   which in turn will notify subscribers.
 
-  @param thd [in]            Handle to THD
-  @param event_class [in]    Event class.
+  @param [in] thd            Handle to THD
+  @param [in] event_class    Event class.
                              We are interested in MYSQL_AUDIT_CONNECTION_CLASS.
-  @param event [in]          mysql_event_connection handle
+  @param [in] event          mysql_event_connection handle
 */
 
 static int
@@ -98,7 +98,7 @@ connection_control_notify(MYSQL_THD thd,
 /**
   Plugin initialization function
 
-  @param plugin_info [in]  MYSQL_PLUGIN information
+  @param [in] plugin_info  MYSQL_PLUGIN information
 
   @returns initialization status
     @retval 0 Success

plugin/connection_control/connection_control_coordinator.cc

@@ -42,10 +42,10 @@ namespace connection_control
       2. Set of variables for which subscriber would like to receive update
       3. Set of stats for which subscriber would like to send update
 
-    @param subscriber [in]    Handle to Connection_event_observers
-    @param events [in]        Event mask supplied by subscriber
-    @param sys_vars [in]      opt_connection_control vector
-    @param status_vars [in]   stats_connection_control vector
+    @param [in] subscriber    Handle to Connection_event_observers
+    @param [in] events        Event mask supplied by subscriber
+    @param [in] sys_vars      opt_connection_control vector
+    @param [in] status_vars   stats_connection_control vector
 
     @returns subscription status
       @retval false Subscription successful
@@ -160,9 +160,9 @@ namespace connection_control
 
       Note : If we receive error from a subscriber, we log it and move on.
 
-      @param thd [in]               THD handle
-      @param error_handler [in]     Error handler class
-      @param connection_event [in]  Event information
+      @param [in] thd               THD handle
+      @param [in] error_handler     Error handler class
+      @param [in] connection_event  Event information
   */
 
   void
@@ -197,9 +197,9 @@ namespace connection_control
 
     Note : If we receive error from a subscriber, we log it and move on.
 
-    @param error_hanlder [in]     Error handler class
-    @param opt_connection_control Variable information
-    @param new_value [in]         New value for variable
+    @param [in] error_hanlder          Error handler class
+    @param [in] opt_connection_control Variable information
+    @param [in] new_value              New value for variable
   */
 
   void
@@ -230,9 +230,9 @@ namespace connection_control
   /**
     Update a status variable
 
-    @param observer [in]   Requestor
-    @param status_var [in] Status variable to be updated
-    @param action [in]     Operation to be performed on status variable
+    @param [in] observer   Requestor
+    @param [in] status_var Status variable to be updated
+    @param [in] action     Operation to be performed on status variable
 
     @returns status of the operation
       @retval false Success

plugin/connection_control/connection_delay.cc

@@ -94,7 +94,7 @@ namespace connection_control
   /**
     Helper function for Connection_delay_event::reset_all
 
-    @param ptr [in]        Pointer to an entry in hash
+    @param [in] ptr        Pointer to an entry in hash
 
     @returns 1 to indicate that entry is a match
   */
@@ -113,8 +113,8 @@ namespace connection_control
     fed to an internal calc_hash() which use the defined charset to
     calculate a hash from the key buffer (in most cases a murmur)
 
-    @param el [in]        Pointer to an element in the hash
-    @param length [out]   The length of the key belonging to the element
+    @param [in] el        Pointer to an element in the hash
+    @param [out] length   The length of the key belonging to the element
 
     @returns Pointer to key buffer
   */
@@ -150,7 +150,7 @@ namespace connection_control
   /**
     Creates or updates an entry in hash
 
-    @param s [in]    User information in '<user'@'<host>' format
+    @param [in] s    User information in '<user'@'<host>' format
 
     @returns status of insertion/update
       @retval false  Insertion/Update successful
@@ -214,7 +214,7 @@ namespace connection_control
   /**
     Resets count stored against given user entry
 
-    @param s [in]    User information in '<user'@'<host>' format
+    @param [in] s    User information in '<user'@'<host>' format
 
     @returns status of reset operation
       @retval false Reset successful
@@ -260,7 +260,7 @@ namespace connection_control
   /**
     Retrieve stored value for given user entry
 
-    @param s [in]        User information in '<user'@'<host>' format
+    @param [in] s        User information in '<user'@'<host>' format
     @param value [out]   Buffer to hold value stored against given user
 
     @returns whether given entry is present in hash or not
@@ -350,7 +350,7 @@ namespace connection_control
   /**
     Function to populate information_schema view.
 
-    @param ptr [in]  Entry from LF hash
+    @param [in] ptr  Entry from LF hash
 
     @returns status of row insertion
       @retval 0 Success
@@ -379,8 +379,8 @@ namespace connection_control
   /**
     Function to dump LF hash data to IS table.
 
-    @param thd [in]    THD handle
-    @param tables [in] Handle to
+    @param [in] thd    THD handle
+    @param [in] tables Handle to
                        information_schema.connection_control_failed_attempts
   */
 
@@ -457,8 +457,8 @@ namespace connection_control
     2. Use priv_user/priv_host if either of them is not empty. Else,
     3. Use user/host
 
-    @param thd [in]        THD pointer for getting security context
-    @param s [out]         Hash key is stored here
+    @param [in] thd        THD pointer for getting security context
+    @param [out] s         Hash key is stored here
   */
 
   void
@@ -518,8 +518,8 @@ namespace connection_control
   /**
     Wait till the wait_time expires or thread is killed
 
-    @param thd [in]        Handle to MYSQL_THD object
-    @param wait_time [in]  Maximum time to wait
+    @param [in] thd        Handle to MYSQL_THD object
+    @param [in] wait_time  Maximum time to wait
   */
 
   void
@@ -596,10 +596,10 @@ namespace connection_control
 
     We only care about CONNECT and CHANGE_USER sub events.
 
-    @param thd [in]                THD pointer
-    @param coordinator [in]        Connection_event_coordinator
-    @param connection_event [in]   Connection event to be handled
-    @param error_handler [in]      Error handler object
+    @param [in] thd                THD pointer
+    @param [in] coordinator        Connection_event_coordinator
+    @param [in] connection_event   Connection event to be handled
+    @param [in] error_handler      Error handler object
 
     @returns status of connection event handling
       @retval false  Successfully handled an event.
@@ -712,11 +712,11 @@ namespace connection_control
   /**
     Notification of a change in system variable value
 
-    @param coordinator [in]        Handle to coordinator
-    @param variable [in]           Enum of variable
-    @param new_value [in]          New value for variable
-    @param error_buffer [out]      Buffer to log error message if any
-    @param error_buffer_size [in]  Size of error buffer
+    @param [in] coordinator        Handle to coordinator
+    @param [in] variable           Enum of variable
+    @param [in] new_value          New value for variable
+    @param [out] error_buffer      Buffer to log error message if any
+    @param [in] error_buffer_size  Size of error buffer
 
     @returns processing status
       @retval false  Change in variable value processed successfully
@@ -780,7 +780,7 @@ namespace connection_control
   /**
     Subscribe with coordinator for connection events
 
-    @param coordinator [in]  Handle to Connection_event_coordinator_services
+    @param [in] coordinator  Handle to Connection_event_coordinator_services
                              for registration
   */
   void
@@ -822,9 +822,9 @@ namespace connection_control
   /**
     Get user information from "where userhost = <value>"
 
-    @param cond [in]        Equality condition structure
-    @param eq_arg [out]     Sql_string handle to store user information
-    @param field_name [in]  userhost field
+    @param [in] cond        Equality condition structure
+    @param [out] eq_arg     Sql_string handle to store user information
+    @param [in] field_name  userhost field
 
     @returns whether a value was found or not
       @retval false Found a value. Check eq_arg
@@ -870,10 +870,10 @@ namespace connection_control
 
     Permission : SUPER_ACL is required.
 
-    @param thd [in]     THD handle.
-    @param tables [in]  Handle to
+    @param [in] thd     THD handle.
+    @param [in] tables  Handle to
                         information_schema.connection_control_failed_attempts.
-    @param cond [in]    Condition if any.
+    @param [in] cond    Condition if any.
   */
 
   void
@@ -918,7 +918,7 @@ namespace connection_control
   /**
     Initializes required objects for handling connection events.
 
-    @param coordinator [in]    Connection_event_coordinator_services handle.
+    @param [in] coordinator    Connection_event_coordinator_services handle.
   */
 
   bool init_connection_delay_event(Connection_event_coordinator_services *coordinator,
@@ -967,10 +967,10 @@ namespace connection_control
 /**
   Function to fill information_schema.connection_control_failed_attempts.
 
-  @param thd [in]     THD handle.
-  @param tables [in]  Handle to
+  @param [in] thd     THD handle.
+  @param [in] tables  Handle to
                       information_schema.connection_control_failed_attempts.
-  @param cond [in]    Condition if any.
+  @param [in] cond    Condition if any.
 
   @returns Always returns FALSE.
 */
@@ -988,7 +988,7 @@ int fill_failed_attempts_view(THD *thd,
 /**
   View init function
 
-  @param ptr [in]    Handle to
+  @param [in] ptr    Handle to
                      information_schema.connection_control_failed_attempts.
 
   @returns Always returns 0.

plugin/connection_control/security_context_wrapper.cc

@@ -26,7 +26,7 @@ namespace connection_control
   /**
     Security_context_wrapper constructor.
 
-    @param thd [in]    Handle to THD
+    @param [in] thd    Handle to THD
 
     Get security context from thd.
   */
@@ -39,8 +39,8 @@ namespace connection_control
   /**
     Get value for given property from security context
 
-    @param property [in]    Property to be checked
-    @param value    [out]   Value of the property
+    @param [in] property    Property to be checked
+    @param [out] value      Value of the property
 
     @returns status of property check
       @retval true Error fetching property value