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
81a84424
Commit
81a84424
authored
Jun 29, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SET CHARACTER SET DEFAULT didn't work (Bug #462)
parent
863c5634
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
1 deletion
+35
-1
BUILD/compile-pentium-debug-max
BUILD/compile-pentium-debug-max
+1
-1
mysql-test/r/convert.result
mysql-test/r/convert.result
+17
-0
mysql-test/t/convert.test
mysql-test/t/convert.test
+11
-0
sql/set_var.cc
sql/set_var.cc
+5
-0
sql/set_var.h
sql/set_var.h
+1
-0
No files found.
BUILD/compile-pentium-debug-max
View file @
81a84424
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
path
=
`
dirname
$0
`
path
=
`
dirname
$0
`
.
"
$path
/SETUP.sh"
.
"
$path
/SETUP.sh"
extra_flags
=
"
$pentium_cflags
$debug_cflags
-DBIG_TABLES
"
extra_flags
=
"
$pentium_cflags
$debug_cflags
"
c_warnings
=
"
$c_warnings
$debug_extra_warnings
"
c_warnings
=
"
$c_warnings
$debug_extra_warnings
"
cxx_warnings
=
"
$cxx_warnings
$debug_extra_warnings
"
cxx_warnings
=
"
$cxx_warnings
$debug_extra_warnings
"
extra_configs
=
"
$pentium_configs
$debug_configs
"
extra_configs
=
"
$pentium_configs
$debug_configs
"
...
...
mysql-test/r/convert.result
0 → 100644
View file @
81a84424
select @@convert_character_set;
@@convert_character_set
select @@global.convert_character_set;
@@global.convert_character_set
show variables like "%convert_character_set%";
Variable_name Value
convert_character_set
SET CHARACTER SET cp1251_koi8;
select @@convert_character_set;
@@convert_character_set
cp1251_koi8
SET CHARACTER SET DEFAULT;
select @@convert_character_set;
@@convert_character_set
mysql-test/t/convert.test
0 → 100644
View file @
81a84424
# Test of character set conversions
# Test that SET DEFAULT works
select
@@
convert_character_set
;
select
@@
global
.
convert_character_set
;
show
variables
like
"%convert_character_set%"
;
SET
CHARACTER
SET
cp1251_koi8
;
select
@@
convert_character_set
;
SET
CHARACTER
SET
DEFAULT
;
select
@@
convert_character_set
;
sql/set_var.cc
View file @
81a84424
...
@@ -1083,6 +1083,11 @@ byte *sys_var_thd_conv_charset::value_ptr(THD *thd, enum_var_type type)
...
@@ -1083,6 +1083,11 @@ byte *sys_var_thd_conv_charset::value_ptr(THD *thd, enum_var_type type)
}
}
void
sys_var_thd_conv_charset
::
set_default
(
THD
*
thd
,
enum_var_type
type
)
{
thd
->
variables
.
convert_set
=
global_system_variables
.
convert_set
;
}
bool
sys_var_timestamp
::
update
(
THD
*
thd
,
set_var
*
var
)
bool
sys_var_timestamp
::
update
(
THD
*
thd
,
set_var
*
var
)
{
{
...
...
sql/set_var.h
View file @
81a84424
...
@@ -412,6 +412,7 @@ public:
...
@@ -412,6 +412,7 @@ public:
return
type
!=
STRING_RESULT
;
/* Only accept strings */
return
type
!=
STRING_RESULT
;
/* Only accept strings */
}
}
bool
check_default
(
enum_var_type
type
)
{
return
0
;
}
bool
check_default
(
enum_var_type
type
)
{
return
0
;
}
void
set_default
(
THD
*
thd
,
enum_var_type
type
);
};
};
...
...
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