← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
193
193
  struct st_mysql_sys_var *plugin_var;
194
194
 
195
195
  static void *operator new(size_t size, MEM_ROOT *mem_root)
196
 
  { return (void*) alloc_root(mem_root, (uint) size); }
 
196
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
197
197
  static void operator delete(void *, size_t)
198
198
  { TRASH(ptr_arg, size); }
199
199
 
1362
1362
  plugin_opt_set_limits(&options, var);
1363
1363
 
1364
1364
  if (var->flags & PLUGIN_VAR_UNSIGNED)
1365
 
    *(uint32_t *)save= (uint) getopt_ull_limit_value((uint64_t) tmp, &options,
 
1365
    *(uint32_t *)save= (uint32_t) getopt_ull_limit_value((uint64_t) tmp, &options,
1366
1366
                                                   &fixed);
1367
1367
  else
1368
1368
    *(int *)save= (int) getopt_ll_limit_value(tmp, &options, &fixed);
1772
1772
static unsigned char *intern_sys_var_ptr(Session* session, int offset, bool global_lock)
1773
1773
{
1774
1774
  assert(offset >= 0);
1775
 
  assert((uint)offset <= global_system_variables.dynamic_variables_head);
 
1775
  assert((uint32_t)offset <= global_system_variables.dynamic_variables_head);
1776
1776
 
1777
1777
  if (!session)
1778
1778
    return (unsigned char*) global_system_variables.dynamic_variables_ptr + offset;
1781
1781
    dynamic_variables_head points to the largest valid offset
1782
1782
  */
1783
1783
  if (!session->variables.dynamic_variables_ptr ||
1784
 
      (uint)offset > session->variables.dynamic_variables_head)
 
1784
      (uint32_t)offset > session->variables.dynamic_variables_head)
1785
1785
  {
1786
1786
    uint32_t idx;
1787
1787