← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
234
234
}
235
235
 
236
236
void execute_init_command(Session *session, sys_var_str *init_command_var,
237
 
                          rw_lock_t *var_mutex)
 
237
                          pthread_rwlock_t *var_mutex)
238
238
{
239
239
  Vio* save_vio;
240
240
  ulong save_client_capabilities;
245
245
    during execution of init_command_var query
246
246
    values of init_command_var can't be changed
247
247
  */
248
 
  rw_rdlock(var_mutex);
 
248
  pthread_rwlock_rdlock(var_mutex);
249
249
  save_client_capabilities= session->client_capabilities;
250
250
  session->client_capabilities|= CLIENT_MULTI_STATEMENTS;
251
251
  /*
257
257
  dispatch_command(COM_QUERY, session,
258
258
                   init_command_var->value,
259
259
                   init_command_var->value_length);
260
 
  rw_unlock(var_mutex);
 
260
  pthread_rwlock_unlock(var_mutex);
261
261
  session->client_capabilities= save_client_capabilities;
262
262
  session->net.vio= save_vio;
263
263
}
3500
3500
    rotate_relay_log(active_mi);
3501
3501
    pthread_mutex_unlock(&LOCK_active_mi);
3502
3502
 
3503
 
    /* flush slow and general logs */
3504
 
    logger.flush_logs(session);
3505
 
 
3506
3503
    if (ha_flush_logs(NULL))
3507
3504
      result=1;
3508
3505
    if (flush_error_log())