Commit 300ac0b8 authored by unknown's avatar unknown

Merge avenger.(none):/export/brian/mysql/merge/4.1

into avenger.(none):/export/brian/mysql/merge/5.0


sql/mysqld.cc:
  Auto merged
parents 54a15df8 a899d4e6
...@@ -483,7 +483,7 @@ transaction, i.e., transaction holds LOCK_IX and possibly LOCK_AUTO_INC ...@@ -483,7 +483,7 @@ transaction, i.e., transaction holds LOCK_IX and possibly LOCK_AUTO_INC
on the table. */ on the table. */
ibool ibool
lock_table_exclusive( lock_is_table_exclusive(
/*=================*/ /*=================*/
/* out: TRUE if table is only locked by trx, /* out: TRUE if table is only locked by trx,
with LOCK_IX, and possibly LOCK_AUTO_INC */ with LOCK_IX, and possibly LOCK_AUTO_INC */
......
...@@ -37,6 +37,28 @@ ...@@ -37,6 +37,28 @@
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
#include "ha_ndbcluster.h" #include "ha_ndbcluster.h"
#endif #endif
#ifdef HAVE_INNOBASE_DB
#define OPT_INNODB_DEFAULT 1
#else
#define OPT_INNODB_DEFAULT 0
#endif
#ifdef HAVE_BERKLEY_DB
#define OPT_BDB_DEFAULT 1
#else
#define OPT_BDB_DEFAULT 0
#endif
#ifdef HAVE_ISAM_DB
#define OPT_ISAM_DEFAULT 1
#else
#define OPT_ISAM_DEFAULT 0
#endif
#ifdef HAVE_NDBCLUSTER_DB
#define OPT_NDBCLUSTER_DEFAULT 0
#else
#define OPT_NDBCLUSTER_DEFAULT 0
#endif
#include <nisam.h> #include <nisam.h>
#include <thr_alarm.h> #include <thr_alarm.h>
#include <ft_global.h> #include <ft_global.h>
...@@ -4197,7 +4219,7 @@ struct my_option my_long_options[] = ...@@ -4197,7 +4219,7 @@ struct my_option my_long_options[] =
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"bdb", OPT_BDB, "Enable Berkeley DB (if this version of MySQL supports it). \ {"bdb", OPT_BDB, "Enable Berkeley DB (if this version of MySQL supports it). \
Disable with --skip-bdb (will save memory).", Disable with --skip-bdb (will save memory).",
(gptr*) &opt_bdb, (gptr*) &opt_bdb, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_bdb, (gptr*) &opt_bdb, 0, GET_BOOL, NO_ARG, OPT_BDB_DEFAULT, 0, 0,
0, 0, 0}, 0, 0, 0},
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
{"bdb-home", OPT_BDB_HOME, "Berkeley home directory.", (gptr*) &berkeley_home, {"bdb-home", OPT_BDB_HOME, "Berkeley home directory.", (gptr*) &berkeley_home,
...@@ -4334,7 +4356,7 @@ Disable with --skip-bdb (will save memory).", ...@@ -4334,7 +4356,7 @@ Disable with --skip-bdb (will save memory).",
REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"innodb", OPT_INNODB, "Enable InnoDB (if this version of MySQL supports it). \ {"innodb", OPT_INNODB, "Enable InnoDB (if this version of MySQL supports it). \
Disable with --skip-innodb (will save memory).", Disable with --skip-innodb (will save memory).",
(gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, OPT_INNODB_DEFAULT, 0, 0,
0, 0, 0}, 0, 0, 0},
{"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH, {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH,
"Path to individual files and their sizes.", "Path to individual files and their sizes.",
...@@ -4394,7 +4416,7 @@ Disable with --skip-innodb (will save memory).", ...@@ -4394,7 +4416,7 @@ Disable with --skip-innodb (will save memory).",
#endif /* End HAVE_INNOBASE_DB */ #endif /* End HAVE_INNOBASE_DB */
{"isam", OPT_ISAM, "Enable ISAM (if this version of MySQL supports it). \ {"isam", OPT_ISAM, "Enable ISAM (if this version of MySQL supports it). \
Disable with --skip-isam.", Disable with --skip-isam.",
(gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, OPT_ISAM_DEFAULT, 0, 0,
0, 0, 0}, 0, 0, 0},
{"language", 'L', {"language", 'L',
"Client error messages in given language. May be given as a full path.", "Client error messages in given language. May be given as a full path.",
...@@ -4522,8 +4544,8 @@ master-ssl", ...@@ -4522,8 +4544,8 @@ master-ssl",
GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"ndbcluster", OPT_NDBCLUSTER, "Enable NDB Cluster (if this version of MySQL supports it). \ {"ndbcluster", OPT_NDBCLUSTER, "Enable NDB Cluster (if this version of MySQL supports it). \
Disable with --skip-ndbcluster (will save memory).", Disable with --skip-ndbcluster (will save memory).",
(gptr*) &opt_ndbcluster, (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_ndbcluster, (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG,
0, 0, 0}, OPT_NDBCLUSTER_DEFAULT, 0, 0, 0, 0, 0},
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
{"ndb-connectstring", OPT_NDB_CONNECTSTRING, {"ndb-connectstring", OPT_NDB_CONNECTSTRING,
"Connect string for ndbcluster.", "Connect string for ndbcluster.",
...@@ -6265,9 +6287,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6265,9 +6287,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
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;
#else
if (opt_bdb)
sql_print_warning("this binary does not contain BDB storage engine");
#endif #endif
break; break;
case OPT_ISAM: case OPT_ISAM:
...@@ -6276,9 +6295,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6276,9 +6295,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_isam= SHOW_OPTION_YES; have_isam= SHOW_OPTION_YES;
else else
have_isam= SHOW_OPTION_DISABLED; have_isam= SHOW_OPTION_DISABLED;
#else
if (opt_isam)
sql_print_warning("this binary does not contain ISAM storage engine");
#endif #endif
break; break;
case OPT_NDBCLUSTER: case OPT_NDBCLUSTER:
...@@ -6287,9 +6303,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6287,9 +6303,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_ndbcluster= SHOW_OPTION_YES; have_ndbcluster= SHOW_OPTION_YES;
else else
have_ndbcluster= SHOW_OPTION_DISABLED; have_ndbcluster= SHOW_OPTION_DISABLED;
#else
if (opt_ndbcluster)
sql_print_warning("this binary does not contain NDBCLUSTER storage engine");
#endif #endif
break; break;
case OPT_INNODB: case OPT_INNODB:
...@@ -6298,9 +6311,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6298,9 +6311,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_innodb= SHOW_OPTION_YES; have_innodb= SHOW_OPTION_YES;
else else
have_innodb= SHOW_OPTION_DISABLED; have_innodb= SHOW_OPTION_DISABLED;
#else
if (opt_innodb)
sql_print_warning("this binary does not contain INNODB storage engine");
#endif #endif
break; break;
case OPT_INNODB_DATA_FILE_PATH: case OPT_INNODB_DATA_FILE_PATH:
...@@ -6420,6 +6430,24 @@ static void get_options(int argc,char **argv) ...@@ -6420,6 +6430,24 @@ static void get_options(int argc,char **argv)
if ((ho_error= handle_options(&argc, &argv, my_long_options, if ((ho_error= handle_options(&argc, &argv, my_long_options,
get_one_option))) get_one_option)))
exit(ho_error); exit(ho_error);
#ifndef HAVE_NDBCLUSTER_DB
if (opt_ndbcluster)
sql_print_warning("this binary does not contain NDBCLUSTER storage engine");
#endif
#ifndef HAVE_INNOBASE_DB
if (opt_innodb)
sql_print_warning("this binary does not contain INNODB storage engine");
#endif
#ifndef HAVE_ISAM
if (opt_isam)
sql_print_warning("this binary does not contain ISAM storage engine");
#endif
#ifndef HAVE_BERKELEY_DB
if (opt_bdb)
sql_print_warning("this binary does not contain BDB storage engine");
#endif
if (argc > 0) if (argc > 0)
{ {
fprintf(stderr, "%s: Too many arguments (first extra is '%s').\nUse --help to get a list of available options\n", my_progname, *argv); fprintf(stderr, "%s: Too many arguments (first extra is '%s').\nUse --help to get a list of available options\n", my_progname, *argv);
......
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