Finished merging wl5986 started by Igor.

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_signal.h b/sql/sql_signal.h
index 6c77d4cb0bb..2a508eed5bf 100644
--- a/sql/sql_signal.h
+++ b/sql/sql_signal.h
@@ -29,7 +29,7 @@ protected:
     @param cond the condition signaled if any, or NULL.
     @param set collection of signal condition item assignments.
   */
-  Sql_cmd_common_signal(const sp_cond_type *cond,
+  Sql_cmd_common_signal(const sp_condition_value *cond,
                         const Set_signal_information& set)
     : Sql_cmd(),
       m_cond(cond),
@@ -80,7 +80,7 @@ protected:
     The condition to signal or resignal.
     This member is optional and can be NULL (RESIGNAL).
   */
-  const sp_cond_type *m_cond;
+  const sp_condition_value *m_cond;
 
   /**
     Collection of 'SET item = value' assignments in the
@@ -100,7 +100,7 @@ public:
     @param cond the SQL condition to signal (required).
     @param set the collection of signal informations to signal.
   */
-  Sql_cmd_signal(const sp_cond_type *cond,
+  Sql_cmd_signal(const sp_condition_value *cond,
                  const Set_signal_information& set)
     : Sql_cmd_common_signal(cond, set)
   {}
@@ -127,7 +127,7 @@ public:
     @param cond the SQL condition to resignal (optional, may be NULL).
     @param set the collection of signal informations to resignal.
   */
-  Sql_cmd_resignal(const sp_cond_type *cond,
+  Sql_cmd_resignal(const sp_condition_value *cond,
                    const Set_signal_information& set)
     : Sql_cmd_common_signal(cond, set)
   {}