← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Mark Atwood
  • Date: 2009-01-05 04:37:22 UTC
  • mto: (758.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: me@mark.atwood.name-20090105043722-03l4mzcxi4yjjjih
replace sql_print_error etc with errmsg_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2479
2479
 
2480
2480
#ifdef EXTRA_DEBUG
2481
2481
  if (table->db_stat)
2482
 
    sql_print_error(_("Table %s had a open data handler in reopen_table"),
 
2482
    errmsg_printf(ERRMSG_LVL_ERROR, _("Table %s had a open data handler in reopen_table"),
2483
2483
                    table->alias);
2484
2484
#endif
2485
2485
  memset(&table_list, 0, sizeof(TableList));
3128
3128
       /* Give right error message */
3129
3129
       session->clear_error();
3130
3130
       my_error(ER_NOT_KEYFILE, MYF(0), share->table_name.str, my_errno);
3131
 
       sql_print_error(_("Couldn't repair table: %s.%s"), share->db.str,
 
3131
       errmsg_printf(ERRMSG_LVL_ERROR, _("Couldn't repair table: %s.%s"), share->db.str,
3132
3132
                       share->table_name.str);
3133
3133
       if (entry->file)
3134
3134
        closefrm(entry, 0);
3171
3171
      }
3172
3172
      else
3173
3173
      {
3174
 
        sql_print_error(_("When opening HEAP table, could not allocate memory "
 
3174
        errmsg_printf(ERRMSG_LVL_ERROR, _("When opening HEAP table, could not allocate memory "
3175
3175
                          "to write 'DELETE FROM `%s`.`%s`' to the binary log"),
3176
3176
                        table_list->db, table_list->table_name);
3177
3177
        my_error(ER_OUTOFMEMORY, MYF(0), query_buf_size);
3780
3780
  if (file && file->ha_delete_table(path))
3781
3781
  {
3782
3782
    error=1;
3783
 
    sql_print_warning(_("Could not remove temporary table: '%s', error: %d"),
 
3783
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),
3784
3784
                      path, my_errno);
3785
3785
  }
3786
3786
  delete file;
6384
6384
    abort_loop=1;
6385
6385
    if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
6386
6386
                           (void*) 0))
6387
 
      sql_print_error(_("Can't create thread to kill server"));
 
6387
      errmsg_printf(ERRMSG_LVL_ERROR, _("Can't create thread to kill server"));
6388
6388
  }
6389
6389
#endif
6390
6390
  return;;