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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
988a98c3
Commit
988a98c3
authored
Dec 26, 2000
by
monty@donna.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
parents
384b371b
a12c1ffb
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
262 additions
and
100 deletions
+262
-100
.bzrignore
.bzrignore
+2
-0
Docs/manual.texi
Docs/manual.texi
+192
-87
sql/gen_lex_hash.cc
sql/gen_lex_hash.cc
+1
-1
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+44
-4
sql/sql_show.cc
sql/sql_show.cc
+19
-6
sql/structs.h
sql/structs.h
+3
-1
No files found.
.bzrignore
View file @
988a98c3
...
@@ -181,3 +181,5 @@ mysql-test/mysql-test-run
...
@@ -181,3 +181,5 @@ mysql-test/mysql-test-run
BitKeeper/tmp/gone
BitKeeper/tmp/gone
mysqld.S
mysqld.S
mysqld.sym
mysqld.sym
.snprj/*
sql-bench/output/*
Docs/manual.texi
View file @
988a98c3
This diff is collapsed.
Click to expand it.
sql/gen_lex_hash.cc
View file @
988a98c3
...
@@ -472,7 +472,7 @@ int main(int argc,char **argv)
...
@@ -472,7 +472,7 @@ int main(int argc,char **argv)
int
error
;
int
error
;
MY_INIT
(
argv
[
0
]);
MY_INIT
(
argv
[
0
]);
start_value
=
5
206280L
;
best_t1
=
590774L
;
best_t2
=
5977654L
;
best_type
=
1
;
/* mode=6229 add=2
func_type: 0 */
start_value
=
5
307411L
;
best_t1
=
4597287L
;
best_t2
=
3375760L
;
best_type
=
1
;
/* mode=4783 add=5
func_type: 0 */
if
(
get_options
(
argc
,(
char
**
)
argv
))
if
(
get_options
(
argc
,(
char
**
)
argv
))
exit
(
1
);
exit
(
1
);
...
...
sql/mysql_priv.h
View file @
988a98c3
...
@@ -520,7 +520,7 @@ extern ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
...
@@ -520,7 +520,7 @@ extern ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
binlog_cache_size
,
max_binlog_cache_size
;
binlog_cache_size
,
max_binlog_cache_size
;
extern
ulong
specialflag
,
current_pid
;
extern
ulong
specialflag
,
current_pid
;
extern
bool
low_priority_updates
;
extern
bool
low_priority_updates
;
extern
bool
opt_sql_bin_update
;
extern
bool
opt_sql_bin_update
,
opt_safe_show_db
;
extern
char
language
[
LIBLEN
],
reg_ext
[
FN_EXTLEN
],
blob_newline
;
extern
char
language
[
LIBLEN
],
reg_ext
[
FN_EXTLEN
],
blob_newline
;
extern
const
char
**
errmesg
;
/* Error messages */
extern
const
char
**
errmesg
;
/* Error messages */
extern
byte
last_ref
[
MAX_REFLENGTH
];
/* Index ref of keys */
extern
byte
last_ref
[
MAX_REFLENGTH
];
/* Index ref of keys */
...
...
sql/mysqld.cc
View file @
988a98c3
...
@@ -146,6 +146,33 @@ static uint handler_count;
...
@@ -146,6 +146,33 @@ static uint handler_count;
static
bool
opt_console
=
0
;
static
bool
opt_console
=
0
;
#endif
#endif
#ifdef HAVE_BERKELEY_DB
SHOW_COMP_OPTION
have_berkeley_db
=
SHOW_OPTION_YES
;
#else
SHOW_COMP_OPTION
have_berkeley_db
=
SHOW_OPTION_NO
;
#endif
#ifdef HAVE_GEMENI_DB
SHOW_COMP_OPTION
have_gemeni
=
SHOW_OPTION_YES
;
#else
SHOW_COMP_OPTION
have_gemeni
=
SHOW_OPTION_NO
;
#endif
#ifdef HAVE_INNOBASE_DB
SHOW_COMP_OPTION
have_innobase
=
SHOW_OPTION_YES
;
#else
SHOW_COMP_OPTION
have_innobase
=
SHOW_OPTION_NO
;
#endif
#ifdef USE_RAID
SHOW_COMP_OPTION
have_raid
=
SHOW_OPTION_YES
;
#else
SHOW_COMP_OPTION
have_raid
=
SHOW_OPTION_NO
;
#endif
#ifdef HAVE_OPENSSL
SHOW_COMP_OPTION
have_ssl
=
SHOW_OPTION_YES
;
#else
SHOW_COMP_OPTION
have_ssl
=
SHOW_OPTION_NO
;
#endif
static
bool
opt_skip_slave_start
=
0
;
// if set, slave is not autostarted
static
bool
opt_skip_slave_start
=
0
;
// if set, slave is not autostarted
static
ulong
opt_specialflag
=
SPECIAL_ENGLISH
;
static
ulong
opt_specialflag
=
SPECIAL_ENGLISH
;
static
my_socket
unix_sock
=
INVALID_SOCKET
,
ip_sock
=
INVALID_SOCKET
;
static
my_socket
unix_sock
=
INVALID_SOCKET
,
ip_sock
=
INVALID_SOCKET
;
...
@@ -155,9 +182,10 @@ static my_string opt_logname=0,opt_update_logname=0,
...
@@ -155,9 +182,10 @@ static my_string opt_logname=0,opt_update_logname=0,
static
char
mysql_home
[
FN_REFLEN
],
pidfile_name
[
FN_REFLEN
];
static
char
mysql_home
[
FN_REFLEN
],
pidfile_name
[
FN_REFLEN
];
static
pthread_t
select_thread
;
static
pthread_t
select_thread
;
static
bool
opt_log
,
opt_update_log
,
opt_bin_log
,
opt_slow_log
,
opt_noacl
,
static
bool
opt_log
,
opt_update_log
,
opt_bin_log
,
opt_slow_log
,
opt_noacl
,
opt_disable_networking
=
0
,
opt_bootstrap
=
0
,
opt_skip_show_db
=
0
,
opt_disable_networking
=
0
,
opt_bootstrap
=
0
,
opt_skip_show_db
=
0
,
opt_ansi_mode
=
0
,
opt_myisam_log
=
0
,
opt_large_files
=
sizeof
(
my_off_t
)
>
4
;
opt_ansi_mode
=
0
,
opt_myisam_log
=
0
,
bool
opt_sql_bin_update
=
0
,
opt_log_slave_updates
=
0
;
opt_large_files
=
sizeof
(
my_off_t
)
>
4
;
bool
opt_sql_bin_update
=
0
,
opt_log_slave_updates
=
0
,
opt_safe_show_db
=
0
;
FILE
*
bootstrap_file
=
0
;
FILE
*
bootstrap_file
=
0
;
int
segfaulted
=
0
;
// ensure we do not enter SIGSEGV handler twice
int
segfaulted
=
0
;
// ensure we do not enter SIGSEGV handler twice
extern
MASTER_INFO
glob_mi
;
extern
MASTER_INFO
glob_mi
;
...
@@ -2322,7 +2350,7 @@ enum options {
...
@@ -2322,7 +2350,7 @@ enum options {
OPT_INNOBASE_DATA_HOME_DIR
,
OPT_INNOBASE_DATA_FILE_PATH
,
OPT_INNOBASE_DATA_HOME_DIR
,
OPT_INNOBASE_DATA_FILE_PATH
,
OPT_INNOBASE_LOG_GROUP_HOME_DIR
,
OPT_INNOBASE_LOG_GROUP_HOME_DIR
,
OPT_INNOBASE_LOG_ARCH_DIR
,
OPT_INNOBASE_LOG_ARCHIVE
,
OPT_INNOBASE_LOG_ARCH_DIR
,
OPT_INNOBASE_LOG_ARCHIVE
,
OPT_INNOBASE_FLUSH_LOG_AT_TRX_COMMIT
OPT_INNOBASE_FLUSH_LOG_AT_TRX_COMMIT
,
OPT_SAFE_SHOW_DB
};
};
static
struct
option
long_options
[]
=
{
static
struct
option
long_options
[]
=
{
...
@@ -2424,6 +2452,7 @@ static struct option long_options[] = {
...
@@ -2424,6 +2452,7 @@ static struct option long_options[] = {
{
"replicate-rewrite-db"
,
required_argument
,
0
,
{
"replicate-rewrite-db"
,
required_argument
,
0
,
(
int
)
OPT_REPLICATE_REWRITE_DB
},
(
int
)
OPT_REPLICATE_REWRITE_DB
},
{
"safe-mode"
,
no_argument
,
0
,
(
int
)
OPT_SAFE
},
{
"safe-mode"
,
no_argument
,
0
,
(
int
)
OPT_SAFE
},
{
"safe-show-database"
,
no_argument
,
0
,
(
int
)
OPT_SAFE_SHOW_DB
},
{
"socket"
,
required_argument
,
0
,
(
int
)
OPT_SOCKET
},
{
"socket"
,
required_argument
,
0
,
(
int
)
OPT_SOCKET
},
{
"server-id"
,
required_argument
,
0
,
(
int
)
OPT_SERVER_ID
},
{
"server-id"
,
required_argument
,
0
,
(
int
)
OPT_SERVER_ID
},
{
"set-variable"
,
required_argument
,
0
,
'O'
},
{
"set-variable"
,
required_argument
,
0
,
'O'
},
...
@@ -2593,6 +2622,11 @@ struct show_var_st init_vars[]= {
...
@@ -2593,6 +2622,11 @@ struct show_var_st init_vars[]= {
{
"delayed_queue_size"
,
(
char
*
)
&
delayed_queue_size
,
SHOW_LONG
},
{
"delayed_queue_size"
,
(
char
*
)
&
delayed_queue_size
,
SHOW_LONG
},
{
"flush"
,
(
char
*
)
&
myisam_flush
,
SHOW_MY_BOOL
},
{
"flush"
,
(
char
*
)
&
myisam_flush
,
SHOW_MY_BOOL
},
{
"flush_time"
,
(
char
*
)
&
flush_time
,
SHOW_LONG
},
{
"flush_time"
,
(
char
*
)
&
flush_time
,
SHOW_LONG
},
{
"have_bdb"
,
(
char
*
)
&
have_berkeley_db
,
SHOW_HAVE
},
{
"have_gemeni"
,
(
char
*
)
&
have_gemeni
,
SHOW_HAVE
},
{
"have_innobase"
,
(
char
*
)
&
have_innobase
,
SHOW_HAVE
},
{
"have_raid"
,
(
char
*
)
&
have_raid
,
SHOW_HAVE
},
{
"have_ssl"
,
(
char
*
)
&
have_ssl
,
SHOW_HAVE
},
{
"init_file"
,
(
char
*
)
&
opt_init_file
,
SHOW_CHAR_PTR
},
{
"init_file"
,
(
char
*
)
&
opt_init_file
,
SHOW_CHAR_PTR
},
{
"interactive_timeout"
,
(
char
*
)
&
net_interactive_timeout
,
SHOW_LONG
},
{
"interactive_timeout"
,
(
char
*
)
&
net_interactive_timeout
,
SHOW_LONG
},
{
"join_buffer_size"
,
(
char
*
)
&
join_buff_size
,
SHOW_LONG
},
{
"join_buffer_size"
,
(
char
*
)
&
join_buff_size
,
SHOW_LONG
},
...
@@ -2631,6 +2665,7 @@ struct show_var_st init_vars[]= {
...
@@ -2631,6 +2665,7 @@ struct show_var_st init_vars[]= {
{
"protocol_version"
,
(
char
*
)
&
protocol_version
,
SHOW_INT
},
{
"protocol_version"
,
(
char
*
)
&
protocol_version
,
SHOW_INT
},
{
"record_buffer"
,
(
char
*
)
&
my_default_record_cache_size
,
SHOW_LONG
},
{
"record_buffer"
,
(
char
*
)
&
my_default_record_cache_size
,
SHOW_LONG
},
{
"query_buffer_size"
,
(
char
*
)
&
query_buff_size
,
SHOW_LONG
},
{
"query_buffer_size"
,
(
char
*
)
&
query_buff_size
,
SHOW_LONG
},
{
"safe_show_database"
,
(
char
*
)
&
opt_safe_show_db
,
SHOW_BOOL
},
{
"server_id"
,
(
char
*
)
&
server_id
,
SHOW_LONG
},
{
"server_id"
,
(
char
*
)
&
server_id
,
SHOW_LONG
},
{
"skip_locking"
,
(
char
*
)
&
my_disable_locking
,
SHOW_MY_BOOL
},
{
"skip_locking"
,
(
char
*
)
&
my_disable_locking
,
SHOW_MY_BOOL
},
{
"skip_networking"
,
(
char
*
)
&
opt_disable_networking
,
SHOW_BOOL
},
{
"skip_networking"
,
(
char
*
)
&
opt_disable_networking
,
SHOW_BOOL
},
...
@@ -3347,11 +3382,13 @@ static void get_options(int argc,char **argv)
...
@@ -3347,11 +3382,13 @@ static void get_options(int argc,char **argv)
break
;
break
;
case
OPT_BDB_SKIP
:
case
OPT_BDB_SKIP
:
berkeley_skip
=
1
;
berkeley_skip
=
1
;
have_berkeley_db
=
SHOW_OPTION_DISABLED
;
break
;
break
;
#endif
#endif
#ifdef HAVE_INNOBASE_DB
#ifdef HAVE_INNOBASE_DB
case
OPT_INNOBASE_SKIP
:
case
OPT_INNOBASE_SKIP
:
innobase_skip
=
1
;
innobase_skip
=
1
;
have_innobase_db
=
SHOW_HAVE_DISABLED
;
break
;
break
;
case
OPT_INNOBASE_DATA_HOME_DIR
:
case
OPT_INNOBASE_DATA_HOME_DIR
:
innobase_data_home_dir
=
optarg
;
innobase_data_home_dir
=
optarg
;
...
@@ -3410,6 +3447,9 @@ static void get_options(int argc,char **argv)
...
@@ -3410,6 +3447,9 @@ static void get_options(int argc,char **argv)
case
OPT_MASTER_CONNECT_RETRY
:
case
OPT_MASTER_CONNECT_RETRY
:
master_connect_retry
=
atoi
(
optarg
);
master_connect_retry
=
atoi
(
optarg
);
break
;
break
;
case
(
int
)
OPT_SAFE_SHOW_DB
:
opt_safe_show_db
=
1
;
break
;
default:
default:
fprintf
(
stderr
,
"%s: Unrecognized option: %c
\n
"
,
my_progname
,
c
);
fprintf
(
stderr
,
"%s: Unrecognized option: %c
\n
"
,
my_progname
,
c
);
...
...
sql/sql_show.cc
View file @
988a98c3
...
@@ -21,8 +21,6 @@
...
@@ -21,8 +21,6 @@
#include "sql_select.h" // For select_describe
#include "sql_select.h" // For select_describe
#include "sql_acl.h"
#include "sql_acl.h"
#include <my_dir.h>
#include <my_dir.h>
#undef USE_RAID
#define USE_RAID
#ifdef HAVE_BERKELEY_DB
#ifdef HAVE_BERKELEY_DB
#include "ha_berkeley.h" // For berkeley_show_logs
#include "ha_berkeley.h" // For berkeley_show_logs
...
@@ -77,10 +75,17 @@ mysqld_show_dbs(THD *thd,const char *wild)
...
@@ -77,10 +75,17 @@ mysqld_show_dbs(THD *thd,const char *wild)
List_iterator
<
char
>
it
(
files
);
List_iterator
<
char
>
it
(
files
);
while
((
file_name
=
it
++
))
while
((
file_name
=
it
++
))
{
{
thd
->
packet
.
length
(
0
);
if
(
!
opt_safe_show_db
||
thd
->
master_access
||
net_store_data
(
&
thd
->
packet
,
file_name
);
acl_get
(
thd
->
host
,
thd
->
ip
,
(
char
*
)
&
thd
->
remote
.
sin_addr
,
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
thd
->
priv_user
,
file_name
)
||
DBUG_RETURN
(
-
1
);
(
grant_option
&&
!
check_grant_db
(
thd
,
file_name
)))
{
thd
->
packet
.
length
(
0
);
net_store_data
(
&
thd
->
packet
,
file_name
);
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -1088,6 +1093,14 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
...
@@ -1088,6 +1093,14 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
case
SHOW_INT
:
case
SHOW_INT
:
net_store_data
(
&
packet2
,(
uint32
)
*
(
int
*
)
variables
[
i
].
value
);
net_store_data
(
&
packet2
,(
uint32
)
*
(
int
*
)
variables
[
i
].
value
);
break
;
break
;
case
SHOW_HAVE
:
{
SHOW_COMP_OPTION
tmp
=
*
(
SHOW_COMP_OPTION
*
)
variables
[
i
].
value
;
net_store_data
(
&
packet2
,
(
tmp
==
SHOW_OPTION_NO
?
"NO"
:
tmp
==
SHOW_OPTION_YES
?
"YES"
:
"DISABLED"
));
break
;
}
case
SHOW_CHAR
:
case
SHOW_CHAR
:
net_store_data
(
&
packet2
,
variables
[
i
].
value
);
net_store_data
(
&
packet2
,
variables
[
i
].
value
);
break
;
break
;
...
...
sql/structs.h
View file @
988a98c3
...
@@ -125,7 +125,9 @@ typedef struct {
...
@@ -125,7 +125,9 @@ typedef struct {
enum
SHOW_TYPE
{
SHOW_LONG
,
SHOW_CHAR
,
SHOW_INT
,
SHOW_CHAR_PTR
,
SHOW_BOOL
,
enum
SHOW_TYPE
{
SHOW_LONG
,
SHOW_CHAR
,
SHOW_INT
,
SHOW_CHAR_PTR
,
SHOW_BOOL
,
SHOW_MY_BOOL
,
SHOW_OPENTABLES
,
SHOW_STARTTIME
,
SHOW_QUESTION
,
SHOW_MY_BOOL
,
SHOW_OPENTABLES
,
SHOW_STARTTIME
,
SHOW_QUESTION
,
SHOW_LONG_CONST
,
SHOW_INT_CONST
};
SHOW_LONG_CONST
,
SHOW_INT_CONST
,
SHOW_HAVE
};
enum
SHOW_COMP_OPTION
{
SHOW_OPTION_YES
,
SHOW_OPTION_NO
,
SHOW_OPTION_DISABLED
};
struct
show_var_st
{
struct
show_var_st
{
const
char
*
name
;
const
char
*
name
;
...
...
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