~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_yacc.yy

  • 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:
1221
1221
                Lex->mi.heartbeat_period < 0.0)
1222
1222
            {
1223
1223
              char buf[sizeof(SLAVE_MAX_HEARTBEAT_PERIOD*4)];
1224
 
              my_sprintf(buf, (buf, "%d seconds", SLAVE_MAX_HEARTBEAT_PERIOD));
 
1224
              sprintf(buf, "%d seconds", SLAVE_MAX_HEARTBEAT_PERIOD);
1225
1225
              my_error(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
1226
1226
                       MYF(0),
1227
1227
                       " is negative or exceeds the maximum ",