Fix the constants names

Author: sanja-byelkin

sql/sql_class.h

@@ -5782,11 +5782,11 @@ class select_dumpvar :public select_result_interceptor {
 /**
  SP Bulk execution safe
 */
-#define CF_SP_BULK_SAFE (1U << 20)
+#define CF_PS_ARRAY_BINDING_SAFE (1U << 20)
 /**
  SP Bulk execution optimized
 */
-#define CF_SP_BULK_OPTIMIZED (1U << 21)
+#define CF_PS_ARRAY_BINDING_OPTIMIZED (1U << 21)
 
 /* Bits in server_command_flags */
 

sql/sql_parse.cc

@@ -577,19 +577,21 @@ void init_update_queries(void)
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
  CF_CAN_BE_EXPLAINED |
- CF_UPDATES_DATA | CF_SP_BULK_SAFE;
+ CF_UPDATES_DATA |
+ CF_PS_ARRAY_BINDING_SAFE;
  sql_command_flags[SQLCOM_UPDATE_MULTI]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
  CF_CAN_BE_EXPLAINED |
- CF_UPDATES_DATA | CF_SP_BULK_SAFE;
+ CF_UPDATES_DATA |
+ CF_PS_ARRAY_BINDING_SAFE;
  sql_command_flags[SQLCOM_INSERT]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
  CF_CAN_BE_EXPLAINED |
  CF_INSERTS_DATA |
- CF_SP_BULK_SAFE |
- CF_SP_BULK_OPTIMIZED;
+ CF_PS_ARRAY_BINDING_SAFE |
+ CF_PS_ARRAY_BINDING_OPTIMIZED;
  sql_command_flags[SQLCOM_INSERT_SELECT]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
@@ -599,7 +601,7 @@ void init_update_queries(void)
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
  CF_CAN_BE_EXPLAINED |
- CF_SP_BULK_SAFE;
+ CF_PS_ARRAY_BINDING_SAFE;
  sql_command_flags[SQLCOM_DELETE_MULTI]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
@@ -608,8 +610,9 @@ void init_update_queries(void)
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |
  CF_CAN_BE_EXPLAINED |
- CF_INSERTS_DATA | CF_SP_BULK_SAFE |
- CF_SP_BULK_OPTIMIZED;
+ CF_INSERTS_DATA |
+ CF_PS_ARRAY_BINDING_SAFE |
+ CF_PS_ARRAY_BINDING_OPTIMIZED;
  sql_command_flags[SQLCOM_REPLACE_SELECT]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
  CF_CAN_GENERATE_ROW_EVENTS |
  CF_OPTIMIZER_TRACE |

sql/sql_prepare.cc

@@ -4390,7 +4390,7 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
  return TRUE;
  }
 
- if (!(sql_command_flags[lex->sql_command] & CF_SP_BULK_SAFE))
+ if (!(sql_command_flags[lex->sql_command] & CF_PS_ARRAY_BINDING_SAFE))
  {
  DBUG_PRINT("error", ("Command is not supported in bulk execution."));
  my_error(ER_UNSUPPORTED_PS, MYF(0));
@@ -4432,7 +4432,7 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
  Here we set parameters for not optimized commands,
  optimized commands do it inside thier internal loop.
  */
- if (!(sql_command_flags[lex->sql_command] & CF_SP_BULK_OPTIMIZED))
+ if (!(sql_command_flags[lex->sql_command] & CF_PS_ARRAY_BINDING_OPTIMIZED))
  {
  if (set_bulk_parameters(TRUE))
  {