← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

MErge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
357
357
      */
358
358
      if (alter_info->build_method == HA_BUILD_ONLINE)
359
359
      {
360
 
        my_error(ER_NOT_SUPPORTED_YET, MYF(0), session->query);
 
360
        my_error(ER_NOT_SUPPORTED_YET, MYF(0), session->query.c_str());
361
361
        goto err;
362
362
      }
363
363
      alter_info->build_method= HA_BUILD_OFFLINE;
575
575
    error=1;
576
576
  if (error)
577
577
    goto err;
578
 
  write_bin_log(session, session->query, session->query_length);
 
578
  write_bin_log(session, session->query.c_str());
579
579
 
580
580
err:
581
581
  (void) transaction_services.ha_autocommit_or_rollback(session, error);
962
962
 
963
963
    if (error == 0)
964
964
    {
965
 
      write_bin_log(session, session->query, session->query_length);
 
965
      write_bin_log(session, session->query.c_str());
966
966
      session->my_ok();
967
967
    }
968
968
    else if (error > 0)
1163
1163
 
1164
1164
  session->set_proc_info("end");
1165
1165
 
1166
 
  write_bin_log(session, session->query, session->query_length);
 
1166
  write_bin_log(session, session->query.c_str());
1167
1167
  table_list->table= NULL;
1168
1168
 
1169
1169
end_temporary: