← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-10-22 23:29:43 UTC
  • Revision ID: monty@inaugust.com-20081022232943-wac6odtbabp74d29
Cleaned up version.h. (And by cleaned, I mean removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
2666
2666
  }
2667
2667
 
2668
2668
  sql_print_information(_(ER(ER_STARTUP)),my_progname,server_version,
2669
 
                        "", mysqld_port, DRIZZLE_COMPILATION_COMMENT);
 
2669
                        "", mysqld_port, COMPILATION_COMMENT);
2670
2670
 
2671
2671
 
2672
2672
  handle_connections_sockets();
4142
4142
    version from the output of 'mysqld --version', so don't change it!
4143
4143
  */
4144
4144
  printf("%s  Ver %s for %s on %s (%s)\n",my_progname,
4145
 
         server_version,SYSTEM_TYPE,MACHINE_TYPE, DRIZZLE_COMPILATION_COMMENT);
 
4145
         server_version,SYSTEM_TYPE,MACHINE_TYPE, COMPILATION_COMMENT);
4146
4146
}
4147
4147
 
4148
4148
static void usage(void)
4253
4253
  what_to_log= ~ (1L << (uint) COM_TIME);
4254
4254
  refresh_version= 1L;  /* Increments on each reload */
4255
4255
  global_query_id= thread_id= 1L;
4256
 
  my_stpcpy(server_version, DRIZZLE_SERVER_VERSION);
 
4256
  my_stpcpy(server_version, VERSION);
4257
4257
  myisam_recover_options_str= "OFF";
4258
4258
  myisam_stats_method_str= "nulls_unequal";
4259
4259
  threads.empty();
4738
4738
#ifdef DRIZZLE_SERVER_SUFFIX
4739
4739
#define DRIZZLE_SERVER_SUFFIX_STR STRINGIFY_ARG(DRIZZLE_SERVER_SUFFIX)
4740
4740
#else
4741
 
#define DRIZZLE_SERVER_SUFFIX_STR DRIZZLE_SERVER_SUFFIX_DEF
 
4741
#define DRIZZLE_SERVER_SUFFIX_STR ""
4742
4742
#endif
4743
4743
 
4744
4744
static void set_server_version(void)
4745
4745
{
4746
 
  char *end= strxmov(server_version, DRIZZLE_SERVER_VERSION,
 
4746
  char *end= strxmov(server_version, VERSION,
4747
4747
                     DRIZZLE_SERVER_SUFFIX_STR, NULL);
4748
4748
  if (opt_bin_log)
4749
4749
    my_stpcpy(end, "-log");                        // This may slow down system