Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4579806f
Commit
4579806f
authored
Nov 30, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
928d2a8b
ac207293
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
17 deletions
+45
-17
sql/mysqld.cc
sql/mysqld.cc
+45
-17
No files found.
sql/mysqld.cc
View file @
4579806f
...
@@ -36,6 +36,28 @@
...
@@ -36,6 +36,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>
...
@@ -4089,7 +4111,7 @@ struct my_option my_long_options[] =
...
@@ -4089,7 +4111,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
,
...
@@ -4226,7 +4248,7 @@ Disable with --skip-bdb (will save memory).",
...
@@ -4226,7 +4248,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."
,
...
@@ -4286,7 +4308,7 @@ Disable with --skip-innodb (will save memory).",
...
@@ -4286,7 +4308,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."
,
...
@@ -4413,8 +4435,8 @@ master-ssl",
...
@@ -4413,8 +4435,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."
,
...
@@ -6105,9 +6127,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -6105,9 +6127,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
:
...
@@ -6116,9 +6135,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -6116,9 +6135,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
:
...
@@ -6127,9 +6143,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -6127,9 +6143,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
:
...
@@ -6138,9 +6151,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -6138,9 +6151,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
:
...
@@ -6260,6 +6270,24 @@ static void get_options(int argc,char **argv)
...
@@ -6260,6 +6270,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').
\n
Use --help to get a list of available options
\n
"
,
my_progname
,
*
argv
);
fprintf
(
stderr
,
"%s: Too many arguments (first extra is '%s').
\n
Use --help to get a list of available options
\n
"
,
my_progname
,
*
argv
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment