~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Monty fixes pluss a few from me for charset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1649
1649
} /* open_table_error */
1650
1650
 
1651
1651
 
1652
 
TYPELIB *typelib(MEM_ROOT *mem_root, vector<String*> &strings)
 
1652
TYPELIB *typelib(MEM_ROOT *mem_root, const vector<String*> &strings)
1653
1653
{
1654
1654
  TYPELIB *result= (TYPELIB*) alloc_root(mem_root, sizeof(TYPELIB));
1655
1655
  if (!result)
1663
1663
    
1664
1664
  result->type_lengths= (uint*) (result->type_names + result->count + 1);
1665
1665
 
1666
 
  vector<String*>::iterator it= strings.begin();
 
1666
  vector<String*>::const_iterator it= strings.begin();
1667
1667
  for (int i= 0; it != strings.end(); ++it, ++i )
1668
1668
  {
1669
1669
    result->type_names[i]= (*it)->c_ptr();