← Back to branch summary

~brianaker/drizzle/bug786515-trunk

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Mark Atwood
  • Date: 2011-05-02 23:26:54 UTC
  • mfrom: (2290.1.9 server_uuid_repl)
  • Revision ID: me@mark.atwood.name-20110502232654-hd1ufzm7o4mtrutf
merge lp:~skinny.moey/drizzle/server_uuid_repl

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
258
258
uint64_t session_startup_options;
259
259
back_log_constraints back_log(50);
260
260
DRIZZLED_API uint32_t server_id;
 
261
DRIZZLED_API string server_uuid;
261
262
uint64_t table_cache_size;
262
263
size_t table_def_size;
263
264
uint32_t global_thread_id= 1UL;