← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqldump.c

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqldump.c
359
359
  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",
360
360
    (char**) &opt_max_allowed_packet, (char**) &opt_max_allowed_packet, 0,
361
361
    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096,
362
 
   (longlong) 2L*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
 
362
   (int64_t) 2L*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
363
363
  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
364
364
    (char**) &opt_net_buffer_length, (char**) &opt_net_buffer_length, 0,
365
365
    GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,
1486
1486
                                char *ignore_flag)
1487
1487
{
1488
1488
  bool    init=0, delayed, write_data, complete_insert;
1489
 
  my_ulonglong num_fields;
 
1489
  my_uint64_t num_fields;
1490
1490
  char       *result_table, *opt_quoted_table;
1491
1491
  const char *insert_option;
1492
1492
  char       name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3];
2788
2788
 
2789
2789
  if ((table_res= mysql_store_result(mysql)))
2790
2790
  {
2791
 
    my_ulonglong num_rows= mysql_num_rows(table_res);
 
2791
    my_uint64_t num_rows= mysql_num_rows(table_res);
2792
2792
    if (num_rows > 0)
2793
2793
    {
2794
2794
      ulong *lengths;
3180
3180
        *err_len= var_len;
3181
3181
      }
3182
3182
      else
3183
 
        found|= ((longlong) 1 << (find - 1));
 
3183
        found|= ((int64_t) 1 << (find - 1));
3184
3184
      if (pos == end)
3185
3185
        break;
3186
3186
      start= pos + 1;