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
120dd92b
Commit
120dd92b
authored
Aug 26, 2005
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround (bug #9613: Some read-only variables are selectable, others are not).
parent
6b4baf48
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
mysql-test/r/variables.result
mysql-test/r/variables.result
+3
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+7
-0
sql/set_var.cc
sql/set_var.cc
+10
-0
No files found.
mysql-test/r/variables.result
View file @
120dd92b
...
...
@@ -491,3 +491,6 @@ SHOW VARIABLES LIKE 'table_cache';
Variable_name Value
table_cache 1
SET GLOBAL table_cache=DEFAULT;
select @@have_innodb;
@@have_innodb
#
mysql-test/t/variables.test
View file @
120dd92b
...
...
@@ -381,3 +381,10 @@ SHOW VARIABLES LIKE 'table_cache';
SET
GLOBAL
table_cache
=
DEFAULT
;
# End of 4.1 tests
#
# Bug #9613: @@have_innodb
#
--
replace_column
1
#
select
@@
have_innodb
;
sql/set_var.cc
View file @
120dd92b
...
...
@@ -118,6 +118,7 @@ static KEY_CACHE *create_key_cache(const char *name, uint length);
void
fix_sql_mode_var
(
THD
*
thd
,
enum_var_type
type
);
static
byte
*
get_error_count
(
THD
*
thd
);
static
byte
*
get_warning_count
(
THD
*
thd
);
static
byte
*
get_have_innodb
(
THD
*
thd
);
/*
Variable definition list
...
...
@@ -484,6 +485,8 @@ sys_var_thd_time_zone sys_time_zone("time_zone");
/* Read only variables */
sys_var_const_str
sys_os
(
"version_compile_os"
,
SYSTEM_TYPE
);
sys_var_readonly
sys_have_innodb
(
"have_innodb"
,
OPT_GLOBAL
,
SHOW_CHAR
,
get_have_innodb
);
/* Global read-only variable describing server license */
sys_var_const_str
sys_license
(
"license"
,
STRINGIFY_ARG
(
LICENSE
));
...
...
@@ -529,6 +532,7 @@ sys_var *sys_variables[]=
&
sys_ft_boolean_syntax
,
&
sys_foreign_key_checks
,
&
sys_group_concat_max_len
,
&
sys_have_innodb
,
&
sys_identity
,
&
sys_init_connect
,
&
sys_init_slave
,
...
...
@@ -2614,6 +2618,12 @@ static byte *get_error_count(THD *thd)
}
static
byte
*
get_have_innodb
(
THD
*
thd
)
{
return
(
byte
*
)
show_comp_option_name
[
have_innodb
];
}
/****************************************************************************
Main handling of variables:
- Initialisation
...
...
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