Commit 355004e0 authored by unknown's avatar unknown

stylistic fixes

parent e68a8813
...@@ -47,7 +47,7 @@ static const int max_transactions= 256; ...@@ -47,7 +47,7 @@ static const int max_transactions= 256;
static const ha_rows autoincrement_prefetch= 32; static const ha_rows autoincrement_prefetch= 32;
// connectstring to cluster if given by mysqld // connectstring to cluster if given by mysqld
const char *ndbcluster_connectstring = 0; const char *ndbcluster_connectstring= 0;
#define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8 #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
...@@ -3379,7 +3379,8 @@ bool ndbcluster_init() ...@@ -3379,7 +3379,8 @@ bool ndbcluster_init()
{ {
DBUG_ENTER("ndbcluster_init"); DBUG_ENTER("ndbcluster_init");
// Set connectstring if specified // Set connectstring if specified
if (ndbcluster_connectstring != 0) { if (ndbcluster_connectstring != 0)
{
DBUG_PRINT("connectstring", ("%s", ndbcluster_connectstring)); DBUG_PRINT("connectstring", ("%s", ndbcluster_connectstring));
Ndb::setConnectString(ndbcluster_connectstring); Ndb::setConnectString(ndbcluster_connectstring);
} }
......
...@@ -5977,15 +5977,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -5977,15 +5977,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
} }
case OPT_BDB_SHARED: case OPT_BDB_SHARED:
berkeley_init_flags&= ~(DB_PRIVATE); berkeley_init_flags&= ~(DB_PRIVATE);
berkeley_shared_data=1; berkeley_shared_data= 1;
break; break;
#endif /* HAVE_BERKELEY_DB */ #endif /* HAVE_BERKELEY_DB */
case OPT_BDB: case OPT_BDB:
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
if (opt_bdb) if (opt_bdb)
have_berkeley_db=SHOW_OPTION_YES; have_berkeley_db= SHOW_OPTION_YES;
else else
have_berkeley_db=SHOW_OPTION_DISABLED; have_berkeley_db= SHOW_OPTION_DISABLED;
#endif #endif
break; break;
case OPT_ISAM: case OPT_ISAM:
...@@ -5999,27 +5999,27 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -5999,27 +5999,27 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case OPT_NDBCLUSTER: case OPT_NDBCLUSTER:
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
if (opt_ndbcluster) if (opt_ndbcluster)
have_ndbcluster=SHOW_OPTION_YES; have_ndbcluster= SHOW_OPTION_YES;
else else
have_ndbcluster=SHOW_OPTION_DISABLED; have_ndbcluster= SHOW_OPTION_DISABLED;
#endif #endif
break; break;
case OPT_NDB_CONNECTSTRING: case OPT_NDB_CONNECTSTRING:
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
have_ndbcluster=SHOW_OPTION_YES; have_ndbcluster= SHOW_OPTION_YES;
#endif #endif
break; break;
case OPT_INNODB: case OPT_INNODB:
#ifdef HAVE_INNOBASE_DB #ifdef HAVE_INNOBASE_DB
if (opt_innodb) if (opt_innodb)
have_innodb=SHOW_OPTION_YES; have_innodb= SHOW_OPTION_YES;
else else
have_innodb=SHOW_OPTION_DISABLED; have_innodb= SHOW_OPTION_DISABLED;
#endif #endif
break; break;
case OPT_INNODB_DATA_FILE_PATH: case OPT_INNODB_DATA_FILE_PATH:
#ifdef HAVE_INNOBASE_DB #ifdef HAVE_INNOBASE_DB
innobase_data_file_path=argument; innobase_data_file_path= argument;
#endif #endif
break; break;
#ifdef HAVE_INNOBASE_DB #ifdef HAVE_INNOBASE_DB
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment