~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_malloc.cc

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
RemoveĀ uint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
  }
27
27
}
28
28
 
29
 
void init_sql_alloc(MEM_ROOT *mem_root, uint block_size, uint pre_alloc)
 
29
void init_sql_alloc(MEM_ROOT *mem_root, uint32_t block_size, uint32_t pre_alloc)
30
30
{
31
31
  init_alloc_root(mem_root, block_size, pre_alloc);
32
32
  mem_root->error_handler=sql_alloc_error_handler;
105
105
  }
106
106
  else
107
107
  {
108
 
    uint dummy_errors;
 
108
    uint32_t dummy_errors;
109
109
    new_length= copy_and_convert((char*) pos, new_length, to_cs, str,
110
110
                                 arg_length, from_cs, &dummy_errors);
111
111
  }