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
c99b50f1
Commit
c99b50f1
authored
Sep 02, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12363
parents
ee436f7c
3b077226
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
4 deletions
+23
-4
mysql-test/r/variables.result
mysql-test/r/variables.result
+5
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+8
-0
sql/set_var.cc
sql/set_var.cc
+10
-4
No files found.
mysql-test/r/variables.result
View file @
c99b50f1
...
...
@@ -491,6 +491,11 @@ SHOW VARIABLES LIKE 'table_cache';
Variable_name Value
table_cache 1
SET GLOBAL table_cache=DEFAULT;
set character_set_results=NULL;
select ifnull(@@character_set_results,"really null");
ifnull(@@character_set_results,"really null")
really null
set names latin1;
select @@have_innodb;
@@have_innodb
#
mysql-test/t/variables.test
View file @
c99b50f1
...
...
@@ -380,6 +380,14 @@ SET GLOBAL table_cache=-1;
SHOW
VARIABLES
LIKE
'table_cache'
;
SET
GLOBAL
table_cache
=
DEFAULT
;
#
# Bugs12363: character_set_results is nullable,
# but value_ptr returns string "NULL"
#
set
character_set_results
=
NULL
;
select
ifnull
(
@@
character_set_results
,
"really null"
);
set
names
latin1
;
# End of 4.1 tests
#
...
...
sql/set_var.cc
View file @
c99b50f1
...
...
@@ -1602,11 +1602,17 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base)
return
new
Item_int
((
int32
)
*
(
my_bool
*
)
value_ptr
(
thd
,
var_type
,
base
),
1
);
case
SHOW_CHAR
:
{
Item
_string
*
tmp
;
Item
*
tmp
;
pthread_mutex_lock
(
&
LOCK_global_system_variables
);
char
*
str
=
(
char
*
)
value_ptr
(
thd
,
var_type
,
base
);
tmp
=
new
Item_string
(
str
,
strlen
(
str
),
system_charset_info
,
DERIVATION_SYSCONST
);
if
(
str
)
tmp
=
new
Item_string
(
str
,
strlen
(
str
),
system_charset_info
,
DERIVATION_SYSCONST
);
else
{
tmp
=
new
Item_null
();
tmp
->
collation
.
set
(
system_charset_info
,
DERIVATION_SYSCONST
);
}
pthread_mutex_unlock
(
&
LOCK_global_system_variables
);
return
tmp
;
}
...
...
@@ -1896,7 +1902,7 @@ byte *sys_var_character_set::value_ptr(THD *thd, enum_var_type type,
LEX_STRING
*
base
)
{
CHARSET_INFO
*
cs
=
ci_ptr
(
thd
,
type
)[
0
];
return
cs
?
(
byte
*
)
cs
->
csname
:
(
byte
*
)
"NULL"
;
return
cs
?
(
byte
*
)
cs
->
csname
:
(
byte
*
)
NULL
;
}
...
...
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