← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Mark Atwood
  • Date: 2011-08-01 05:22:14 UTC
  • mfrom: (1919.3.53 drizzle_pbms)
  • Revision ID: me@mark.atwood.name-20110801052214-3wdsx3xgld6b5v4f
merge lp:~barry-leslie/drizzle/drizzle_pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
45
45
#include <drizzled/diagnostics_area.h>
46
46
#include <drizzled/open_tables_state.h>
47
47
#include <drizzled/table/cache.h>
48
 
#include <drizzled/create_field.h>
49
48
 
50
49
#include <algorithm>
51
50
#include <sstream>
634
633
          if (String::needs_conversion(tmp->length(), tmp->charset(), cs))
635
634
          {
636
635
            conv.copy(tmp->ptr(), tmp->length(), cs);
637
 
            interval->type_names[i]= session->mem.strdup(conv);
 
636
            interval->type_names[i]= session->mem.strmake(conv);
638
637
            interval->type_lengths[i]= conv.length();
639
638
          }
640
639
 
2137
2136
 
2138
2137
bool analyze_table(Session* session, TableList* tables)
2139
2138
{
2140
 
  return admin_table(session, tables, "analyze", TL_READ_NO_INSERT, true, &Cursor::ha_analyze);
 
2139
  thr_lock_type lock_type = TL_READ_NO_INSERT;
 
2140
 
 
2141
  return(admin_table(session, tables, "analyze", lock_type, true, &Cursor::ha_analyze));
2141
2142
}
2142
2143
 
2143
2144
 
2144
2145
bool check_table(Session* session, TableList* tables)
2145
2146
{
2146
 
  return admin_table(session, tables, "check", TL_READ_NO_INSERT, false, &Cursor::ha_check);
 
2147
  thr_lock_type lock_type = TL_READ_NO_INSERT;
 
2148
  return admin_table(session, tables, "check", lock_type, false, &Cursor::ha_check);
2147
2149
}
2148
2150
 
2149
2151
} /* namespace drizzled */