← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
160
160
 
161
161
bool opt_daemon= false;
162
162
 
163
 
namespace drizzled
164
 
{
 
163
namespace drizzled {
165
164
 
166
165
inline void setup_fpu()
167
166
{
201
200
 
202
201
#define GET_HA_ROWS GET_ULL
203
202
 
204
 
const char *tx_isolation_names[] =
205
 
{ "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ", "SERIALIZABLE",
206
 
  NULL};
 
203
const char *tx_isolation_names[] = {"READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ", "SERIALIZABLE", NULL};
207
204
 
208
 
TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
209
 
                               tx_isolation_names, NULL};
 
205
TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names) - 1, "", tx_isolation_names, NULL};
210
206
 
211
207
/*
212
208
  Used with --help for detailed option
588
584
void set_user(const char *user, passwd *user_info_arg)
589
585
{
590
586
  assert(user_info_arg != 0);
591
 
  initgroups((char*) user, user_info_arg->pw_gid);
 
587
  initgroups(user, user_info_arg->pw_gid);
592
588
  if (setgid(user_info_arg->pw_gid) == -1)
593
589
  {
594
590
    sql_perror(_("Set process group ID failed"));
2211
2207
  /* @TODO Make this all strings */
2212
2208
  if (vm.count("default-storage-engine"))
2213
2209
  {
2214
 
    default_storage_engine_str= (char *)vm["default-storage-engine"].as<string>().c_str();
 
2210
    default_storage_engine_str= vm["default-storage-engine"].as<string>().c_str();
2215
2211
  }
2216
2212
 
2217
2213
  /* Skip unknown options so that they may be processed later by plugins */