~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/rpl_mi.cc

  • Committer: Jay Pipes
  • Date: 2008-07-17 17:44:14 UTC
  • mfrom: (177 drizzle)
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717174414-sm1e9agb2fjw2ncz
Merged in from trunk.

Made following changes:

libdrizzle/
  client.c
  * Removed DBUG symbols entirely
  * Removed mysql_debug() calls and command line options
  libdrizzle.c
  * Removed DBUG symbols
include/my_sys.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())
mysys/my_init.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())

Show diffs side-by-side

added added

removed removed

Lines of Context:
363
363
     of file we don't care about this garbage.
364
364
  */
365
365
  char heartbeat_buf[sizeof(mi->heartbeat_period) * 4]; // buffer to suffice always
366
 
  my_sprintf(heartbeat_buf, (heartbeat_buf, "%.3f", mi->heartbeat_period));
 
366
  sprintf(heartbeat_buf, "%.3f", mi->heartbeat_period);
367
367
  my_b_seek(file, 0L);
368
368
  my_b_printf(file,
369
369
              "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n",