← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2008-11-22 20:52:40 UTC
  • Revision ID: brian@tangent.org-20081122205240-xei05842t587jh25
Change default option. Also, fixed failure on doing so...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
299
299
bool opt_noacl;
300
300
 
301
301
ulong opt_binlog_rows_event_max_size;
302
 
uint32_t opt_binlog_format_id= (uint32_t) BINLOG_FORMAT_UNSPEC;
 
302
uint32_t opt_binlog_format_id= (uint32_t) BINLOG_FORMAT_ROW;
303
303
#ifdef HAVE_INITGROUPS
304
304
static bool calling_initgroups= false; /**< Used in SIGSEGV handler. */
305
305
#endif
2154
2154
    unireg_abort(1);
2155
2155
  }
2156
2156
 
2157
 
  if (!opt_bin_log)
2158
 
    if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC)
2159
 
    {
2160
 
      sql_print_error(_("You need to use --log-bin to make "
2161
 
                        "--binlog-format work."));
2162
 
      unireg_abort(1);
2163
 
    }
2164
 
    else
2165
 
    {
2166
 
      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
2167
 
    }
2168
 
  else
2169
 
    if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC)
2170
 
      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
2171
 
    else
2172
 
    {
2173
 
      assert(global_system_variables.binlog_format != BINLOG_FORMAT_UNSPEC);
2174
 
    }
 
2157
  global_system_variables.binlog_format= BINLOG_FORMAT_ROW;
2175
2158
 
2176
2159
  if (opt_log_slave_updates && replicate_same_server_id)
2177
2160
  {
4109
4092
  global_system_variables.max_join_size= (uint64_t) HA_POS_ERROR;
4110
4093
  max_system_variables.max_join_size=   (uint64_t) HA_POS_ERROR;
4111
4094
  global_system_variables.old_alter_table= 0;
4112
 
  global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC;
 
4095
  global_system_variables.binlog_format= BINLOG_FORMAT_ROW;
4113
4096
  /*
4114
4097
    Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
4115
4098
    when collecting index statistics for MyISAM tables.