← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 17:18:41 UTC
  • mfrom: (287.3.13 codestyle)
  • Revision ID: brian@tangent.org-20080810171841-pkvi2ky94wbd0nt5
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
329
329
    field_list.push_back(new Item_empty_string("Table",NAME_CHAR_LEN));
330
330
    // 1024 is for not to confuse old clients
331
331
    field_list.push_back(new Item_empty_string("Create Table",
332
 
                                               max(buffer.length(),1024)));
 
332
                                               max(buffer.length(),(uint32_t)1024)));
333
333
  }
334
334
 
335
335
  if (protocol->send_fields(&field_list,
1177
1177
            the comment in sql_class.h why this prevents crashes in possible
1178
1178
            races with query_length
1179
1179
          */
1180
 
          uint length= min(max_query_length, tmp->query_length);
 
1180
          uint length= min((uint32_t)max_query_length, tmp->query_length);
1181
1181
          thd_info->query=(char*) thd->strmake(tmp->query,length);
1182
1182
        }
1183
1183
        thread_infos.append(thd_info);
1288
1288
      if (tmp->query)
1289
1289
      {
1290
1290
        table->field[7]->store(tmp->query,
1291
 
                               min(PROCESS_LIST_INFO_WIDTH,
 
1291
                               min((uint32_t)PROCESS_LIST_INFO_WIDTH,
1292
1292
                                   tmp->query_length), cs);
1293
1293
        table->field[7]->set_notnull();
1294
1294
      }