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
5bd5967b
Commit
5bd5967b
authored
Feb 14, 2006
by
aelkin@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
parents
9321f674
4f859939
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
107 additions
and
4 deletions
+107
-4
mysql-test/r/variables.result
mysql-test/r/variables.result
+18
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+14
-0
sql/mysqld.cc
sql/mysqld.cc
+16
-0
sql/set_var.cc
sql/set_var.cc
+29
-0
sql/set_var.h
sql/set_var.h
+9
-0
sql/sql_class.cc
sql/sql_class.cc
+3
-0
sql/sql_class.h
sql/sql_class.h
+2
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+16
-4
No files found.
mysql-test/r/variables.result
View file @
5bd5967b
...
...
@@ -566,3 +566,21 @@ set global character_set_system = latin1;
ERROR HY000: Variable 'character_set_system' is a read only variable
set @@global.version_compile_os='234';
ERROR HY000: Variable 'version_compile_os' is a read only variable
set character_set_filesystem=latin1;
select @@character_set_filesystem;
@@character_set_filesystem
latin1
set @@global.character_set_filesystem=latin2;
set character_set_filesystem=latin1;
select @@character_set_filesystem;
@@character_set_filesystem
latin1
set @@global.character_set_filesystem=latin2;
set character_set_filesystem=default;
select @@character_set_filesystem;
@@character_set_filesystem
latin2
set @@global.character_set_filesystem=default;
select @@global.character_set_filesystem;
@@global.character_set_filesystem
binary
mysql-test/t/variables.test
View file @
5bd5967b
...
...
@@ -456,4 +456,18 @@ set global character_set_system = latin1;
--
error
1238
set
@@
global
.
version_compile_os
=
'234'
;
#
# Check character_set_filesystem variable
#
set
character_set_filesystem
=
latin1
;
select
@@
character_set_filesystem
;
set
@@
global
.
character_set_filesystem
=
latin2
;
set
character_set_filesystem
=
latin1
;
select
@@
character_set_filesystem
;
set
@@
global
.
character_set_filesystem
=
latin2
;
set
character_set_filesystem
=
default
;
select
@@
character_set_filesystem
;
set
@@
global
.
character_set_filesystem
=
default
;
select
@@
global
.
character_set_filesystem
;
# End of 5.0 tests
sql/mysqld.cc
View file @
5bd5967b
...
...
@@ -321,6 +321,7 @@ static const char *sql_mode_str= "OFF";
static
char
*
mysqld_user
,
*
mysqld_chroot
,
*
log_error_file_ptr
;
static
char
*
opt_init_slave
,
*
language_ptr
,
*
opt_init_connect
;
static
char
*
default_character_set_name
;
static
char
*
character_set_filesystem_name
;
static
char
*
my_bind_addr_str
;
static
char
*
default_collation_name
;
static
char
mysql_data_home_buff
[
2
];
...
...
@@ -469,6 +470,7 @@ MY_BITMAP temp_pool;
CHARSET_INFO
*
system_charset_info
,
*
files_charset_info
;
CHARSET_INFO
*
national_charset_info
,
*
table_alias_charset
;
CHARSET_INFO
*
character_set_filesystem
;
SHOW_COMP_OPTION
have_berkeley_db
,
have_innodb
,
have_isam
,
have_ndbcluster
,
have_example_db
,
have_archive_db
,
have_csv_db
;
...
...
@@ -2677,6 +2679,12 @@ static int init_common_variables(const char *conf_file_name, int argc,
global_system_variables
.
character_set_client
=
default_charset_info
;
global_system_variables
.
collation_connection
=
default_charset_info
;
if
(
!
(
character_set_filesystem
=
get_charset_by_csname
(
character_set_filesystem_name
,
MY_CS_PRIMARY
,
MYF
(
MY_WME
))))
return
1
;
global_system_variables
.
character_set_filesystem
=
character_set_filesystem
;
sys_init_connect
.
value_length
=
0
;
if
((
sys_init_connect
.
value
=
opt_init_connect
))
sys_init_connect
.
value_length
=
strlen
(
opt_init_connect
);
...
...
@@ -4563,6 +4571,7 @@ enum options_mysqld
OPT_GROUP_CONCAT_MAX_LEN
,
OPT_DEFAULT_COLLATION
,
OPT_CHARACTER_SET_CLIENT_HANDSHAKE
,
OPT_CHARACTER_SET_FILESYSTEM
,
OPT_INIT_CONNECT
,
OPT_INIT_SLAVE
,
OPT_SECURE_AUTH
,
...
...
@@ -4671,6 +4680,11 @@ Disable with --skip-bdb (will save memory).",
(
gptr
*
)
&
opt_character_set_client_handshake
,
(
gptr
*
)
&
opt_character_set_client_handshake
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
{
"character-set-filesystem"
,
OPT_CHARACTER_SET_FILESYSTEM
,
"Set the filesystem character set."
,
(
gptr
*
)
&
character_set_filesystem_name
,
(
gptr
*
)
&
character_set_filesystem_name
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"character-set-server"
,
'C'
,
"Set the default character set."
,
(
gptr
*
)
&
default_character_set_name
,
(
gptr
*
)
&
default_character_set_name
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
@@ -6260,6 +6274,7 @@ static void mysql_init_variables(void)
files_charset_info
=
&
my_charset_utf8_general_ci
;
national_charset_info
=
&
my_charset_utf8_general_ci
;
table_alias_charset
=
&
my_charset_bin
;
character_set_filesystem
=
&
my_charset_bin
;
opt_date_time_formats
[
0
]
=
opt_date_time_formats
[
1
]
=
opt_date_time_formats
[
2
]
=
0
;
...
...
@@ -6320,6 +6335,7 @@ static void mysql_init_variables(void)
default_character_set_name
=
(
char
*
)
MYSQL_DEFAULT_CHARSET_NAME
;
default_collation_name
=
(
char
*
)
MYSQL_DEFAULT_COLLATION_NAME
;
sys_charset_system
.
value
=
(
char
*
)
system_charset_info
->
csname
;
character_set_filesystem_name
=
(
char
*
)
"binary"
;
/* Set default values for some option variables */
...
...
sql/set_var.cc
View file @
5bd5967b
...
...
@@ -148,6 +148,7 @@ sys_var_character_set_database sys_character_set_database("character_set_databas
sys_var_character_set_client
sys_character_set_client
(
"character_set_client"
);
sys_var_character_set_connection
sys_character_set_connection
(
"character_set_connection"
);
sys_var_character_set_results
sys_character_set_results
(
"character_set_results"
);
sys_var_character_set_filesystem
sys_character_set_filesystem
(
"character_set_filesystem"
);
sys_var_thd_ulong
sys_completion_type
(
"completion_type"
,
&
SV
::
completion_type
,
check_completion_type
,
...
...
@@ -580,6 +581,7 @@ sys_var *sys_variables[]=
&
sys_character_set_client
,
&
sys_character_set_connection
,
&
sys_character_set_results
,
&
sys_character_set_filesystem
,
&
sys_charset_system
,
&
sys_collation_connection
,
&
sys_collation_database
,
...
...
@@ -771,6 +773,7 @@ struct show_var_st init_vars[]= {
{
sys_character_set_client
.
name
,(
char
*
)
&
sys_character_set_client
,
SHOW_SYS
},
{
sys_character_set_connection
.
name
,(
char
*
)
&
sys_character_set_connection
,
SHOW_SYS
},
{
sys_character_set_database
.
name
,
(
char
*
)
&
sys_character_set_database
,
SHOW_SYS
},
{
sys_character_set_filesystem
.
name
,(
char
*
)
&
sys_character_set_filesystem
,
SHOW_SYS
},
{
sys_character_set_results
.
name
,(
char
*
)
&
sys_character_set_results
,
SHOW_SYS
},
{
sys_character_set_server
.
name
,
(
char
*
)
&
sys_character_set_server
,
SHOW_SYS
},
{
sys_charset_system
.
name
,
(
char
*
)
&
sys_charset_system
,
SHOW_SYS
},
...
...
@@ -2076,6 +2079,32 @@ void sys_var_character_set_client::set_default(THD *thd, enum_var_type type)
}
CHARSET_INFO
**
sys_var_character_set_filesystem
::
ci_ptr
(
THD
*
thd
,
enum_var_type
type
)
{
if
(
type
==
OPT_GLOBAL
)
return
&
global_system_variables
.
character_set_filesystem
;
else
return
&
thd
->
variables
.
character_set_filesystem
;
}
extern
CHARSET_INFO
*
character_set_filesystem
;
void
sys_var_character_set_filesystem
::
set_default
(
THD
*
thd
,
enum_var_type
type
)
{
if
(
type
==
OPT_GLOBAL
)
global_system_variables
.
character_set_filesystem
=
character_set_filesystem
;
else
{
thd
->
variables
.
character_set_filesystem
=
(
global_system_variables
.
character_set_filesystem
);
thd
->
update_charset
();
}
}
CHARSET_INFO
**
sys_var_character_set_results
::
ci_ptr
(
THD
*
thd
,
enum_var_type
type
)
{
...
...
sql/set_var.h
View file @
5bd5967b
...
...
@@ -540,6 +540,15 @@ class sys_var_character_set :public sys_var_thd
virtual
CHARSET_INFO
**
ci_ptr
(
THD
*
thd
,
enum_var_type
type
)
=
0
;
};
class
sys_var_character_set_filesystem
:
public
sys_var_character_set
{
public:
sys_var_character_set_filesystem
(
const
char
*
name_arg
)
:
sys_var_character_set
(
name_arg
)
{}
void
set_default
(
THD
*
thd
,
enum_var_type
type
);
CHARSET_INFO
**
ci_ptr
(
THD
*
thd
,
enum_var_type
type
);
};
class
sys_var_character_set_client
:
public
sys_var_character_set
{
public:
...
...
sql/sql_class.cc
View file @
5bd5967b
...
...
@@ -648,6 +648,9 @@ void THD::update_charset()
charset_is_collation_connection
=
!
String
::
needs_conversion
(
0
,
charset
(),
variables
.
collation_connection
,
&
not_used
);
charset_is_character_set_filesystem
=
!
String
::
needs_conversion
(
0
,
charset
(),
variables
.
character_set_filesystem
,
&
not_used
);
}
...
...
sql/sql_class.h
View file @
5bd5967b
...
...
@@ -569,6 +569,7 @@ struct system_variables
my_bool
old_passwords
;
/* Only charset part of these variables is sensible */
CHARSET_INFO
*
character_set_filesystem
;
CHARSET_INFO
*
character_set_client
;
CHARSET_INFO
*
character_set_results
;
...
...
@@ -1341,6 +1342,7 @@ class THD :public Statement,
bool
query_error
,
bootstrap
,
cleanup_done
;
bool
tmp_table_used
;
bool
charset_is_system_charset
,
charset_is_collation_connection
;
bool
charset_is_character_set_filesystem
;
bool
enable_slow_log
;
/* enable slow log for current statement */
bool
no_trans_update
,
abort_on_warning
;
bool
got_warning
;
/* Set on call to push_warning() */
...
...
sql/sql_yacc.yy
View file @
5bd5967b
...
...
@@ -684,7 +684,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
LEX_HOSTNAME ULONGLONG_NUM field_ident select_alias ident ident_or_text
UNDERSCORE_CHARSET IDENT_sys TEXT_STRING_sys TEXT_STRING_literal
NCHAR_STRING opt_component key_cache_name
sp_opt_label BIN_NUM label_ident
sp_opt_label BIN_NUM label_ident
TEXT_STRING_filesystem
%type <lex_str_ptr>
opt_table_alias
...
...
@@ -5937,7 +5937,7 @@ select_var_ident:
;
into:
INTO OUTFILE TEXT_STRING_
sys
INTO OUTFILE TEXT_STRING_
filesystem
{
LEX *lex= Lex;
lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
...
...
@@ -5946,7 +5946,7 @@ into:
YYABORT;
}
opt_field_term opt_line_term
| INTO DUMPFILE TEXT_STRING_
sys
| INTO DUMPFILE TEXT_STRING_
filesystem
{
LEX *lex=Lex;
if (!lex->describe)
...
...
@@ -6930,7 +6930,7 @@ load: LOAD DATA_SYM
};
load_data:
load_data_lock opt_local INFILE TEXT_STRING_
sys
load_data_lock opt_local INFILE TEXT_STRING_
filesystem
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_LOAD;
...
...
@@ -7459,6 +7459,18 @@ TEXT_STRING_literal:
;
TEXT_STRING_filesystem:
TEXT_STRING
{
THD *thd= YYTHD;
if (thd->charset_is_character_set_filesystem)
$$= $1;
else
thd->convert_string(&$$, thd->variables.character_set_filesystem,
$1.str, $1.length, thd->charset());
}
;
ident:
IDENT_sys { $$=$1; }
| keyword
...
...
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