← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
71
71
 
72
72
*/
73
73
 
74
 
#include <config.h>
 
74
#include "config.h"
75
75
#include "client_priv.h"
76
76
 
77
77
#include "option_string.h"
245
245
 
246
246
static long int timedif(struct timeval a, struct timeval b)
247
247
{
248
 
  int us, s;
 
248
  register int us, s;
249
249
 
250
250
  us = a.tv_usec - b.tv_usec;
251
251
  us /= 1000;