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
7411ac19
Commit
7411ac19
authored
Mar 21, 2004
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
parents
947e6e00
f122e751
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
52 additions
and
26 deletions
+52
-26
mysql-test/r/variables.result
mysql-test/r/variables.result
+11
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+2
-2
mysql-test/t/variables.test
mysql-test/t/variables.test
+12
-0
sql/mysqld.cc
sql/mysqld.cc
+4
-0
sql/set_var.cc
sql/set_var.cc
+14
-16
sql/set_var.h
sql/set_var.h
+3
-2
sql/slave.cc
sql/slave.cc
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+1
-1
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
+4
-4
No files found.
mysql-test/r/variables.result
View file @
7411ac19
...
@@ -382,6 +382,17 @@ select 1;
...
@@ -382,6 +382,17 @@ select 1;
1
1
select @@session.key_buffer_size;
select @@session.key_buffer_size;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable
set ft_boolean_syntax = @@init_connect;
ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL
set global ft_boolean_syntax = @@init_connect;
ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of ''
set init_connect = NULL;
ERROR HY000: Variable 'init_connect' is a GLOBAL variable and should be set with SET GLOBAL
set global init_connect = NULL;
set ft_boolean_syntax = @@init_connect;
ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL
set global ft_boolean_syntax = @@init_connect;
ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of ''
select @@global.max_user_connections,@@local.max_join_size;
select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size
@@global.max_user_connections @@session.max_join_size
100 200
100 200
...
...
mysql-test/t/ctype_utf8.test
View file @
7411ac19
...
@@ -54,7 +54,7 @@ select * from t1;
...
@@ -54,7 +54,7 @@ select * from t1;
drop
table
t1
;
drop
table
t1
;
#
#
# Bug #2366 Wrong utf8 behaviour when data is tr
a
ncated
# Bug #2366 Wrong utf8 behaviour when data is tr
u
ncated
#
#
set
names
koi8r
;
set
names
koi8r
;
create
table
t1
(
s1
char
(
1
)
character
set
utf8
);
create
table
t1
(
s1
char
(
1
)
character
set
utf8
);
...
@@ -101,7 +101,7 @@ drop table t1;
...
@@ -101,7 +101,7 @@ drop table t1;
#
#
# Bug 2699
# Bug 2699
# UTF8 breaks primary keys for cols >
85
characters
# UTF8 breaks primary keys for cols >
333
characters
#
#
--
error
1071
--
error
1071
create
table
t1
(
a
text
character
set
utf8
,
primary
key
(
a
(
360
)));
create
table
t1
(
a
text
character
set
utf8
,
primary
key
(
a
(
360
)));
...
...
mysql-test/t/variables.test
View file @
7411ac19
...
@@ -270,6 +270,18 @@ select 1;
...
@@ -270,6 +270,18 @@ select 1;
--
error
1238
--
error
1238
select
@@
session
.
key_buffer_size
;
select
@@
session
.
key_buffer_size
;
--
error
1229
set
ft_boolean_syntax
=
@@
init_connect
;
--
error
1231
set
global
ft_boolean_syntax
=
@@
init_connect
;
--
error
1229
set
init_connect
=
NULL
;
set
global
init_connect
=
NULL
;
--
error
1229
set
ft_boolean_syntax
=
@@
init_connect
;
--
error
1231
set
global
ft_boolean_syntax
=
@@
init_connect
;
#
#
# swap
# swap
#
#
...
...
sql/mysqld.cc
View file @
7411ac19
...
@@ -2189,10 +2189,14 @@ static int init_common_variables(const char *conf_file_name, int argc,
...
@@ -2189,10 +2189,14 @@ static int init_common_variables(const char *conf_file_name, int argc,
sys_init_connect
.
value_length
=
0
;
sys_init_connect
.
value_length
=
0
;
if
((
sys_init_connect
.
value
=
opt_init_connect
))
if
((
sys_init_connect
.
value
=
opt_init_connect
))
sys_init_connect
.
value_length
=
strlen
(
opt_init_connect
);
sys_init_connect
.
value_length
=
strlen
(
opt_init_connect
);
else
sys_init_connect
.
value
=
my_strdup
(
""
,
MYF
(
0
));
sys_init_slave
.
value_length
=
0
;
sys_init_slave
.
value_length
=
0
;
if
((
sys_init_slave
.
value
=
opt_init_slave
))
if
((
sys_init_slave
.
value
=
opt_init_slave
))
sys_init_slave
.
value_length
=
strlen
(
opt_init_slave
);
sys_init_slave
.
value_length
=
strlen
(
opt_init_slave
);
else
sys_init_slave
.
value
=
my_strdup
(
""
,
MYF
(
0
));
if
(
use_temp_pool
&&
bitmap_init
(
&
temp_pool
,
0
,
1024
,
1
))
if
(
use_temp_pool
&&
bitmap_init
(
&
temp_pool
,
0
,
1024
,
1
))
return
1
;
return
1
;
...
...
sql/set_var.cc
View file @
7411ac19
...
@@ -121,7 +121,8 @@ sys_var_character_set_server sys_character_set_server("character_set_server");
...
@@ -121,7 +121,8 @@ sys_var_character_set_server sys_character_set_server("character_set_server");
sys_var_str
sys_charset_system
(
"character_set_system"
,
sys_var_str
sys_charset_system
(
"character_set_system"
,
sys_check_charset
,
sys_check_charset
,
sys_update_charset
,
sys_update_charset
,
sys_set_default_charset
);
sys_set_default_charset
,
(
char
*
)
my_charset_utf8_general_ci
.
name
);
sys_var_character_set_database
sys_character_set_database
(
"character_set_database"
);
sys_var_character_set_database
sys_character_set_database
(
"character_set_database"
);
sys_var_character_set_client
sys_character_set_client
(
"character_set_client"
);
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_connection
sys_character_set_connection
(
"character_set_connection"
);
...
@@ -150,13 +151,14 @@ sys_var_long_ptr sys_flush_time("flush_time", &flush_time);
...
@@ -150,13 +151,14 @@ sys_var_long_ptr sys_flush_time("flush_time", &flush_time);
sys_var_str
sys_ft_boolean_syntax
(
"ft_boolean_syntax"
,
sys_var_str
sys_ft_boolean_syntax
(
"ft_boolean_syntax"
,
sys_check_ftb_syntax
,
sys_check_ftb_syntax
,
sys_update_ftb_syntax
,
sys_update_ftb_syntax
,
sys_default_ftb_syntax
);
sys_default_ftb_syntax
,
ft_boolean_syntax
);
sys_var_str
sys_init_connect
(
"init_connect"
,
0
,
sys_var_str
sys_init_connect
(
"init_connect"
,
0
,
sys_update_init_connect
,
sys_update_init_connect
,
sys_default_init_connect
);
sys_default_init_connect
,
0
);
sys_var_str
sys_init_slave
(
"init_slave"
,
0
,
sys_var_str
sys_init_slave
(
"init_slave"
,
0
,
sys_update_init_slave
,
sys_update_init_slave
,
sys_default_init_slave
);
sys_default_init_slave
,
0
);
sys_var_thd_ulong
sys_interactive_timeout
(
"interactive_timeout"
,
sys_var_thd_ulong
sys_interactive_timeout
(
"interactive_timeout"
,
&
SV
::
net_interactive_timeout
);
&
SV
::
net_interactive_timeout
);
sys_var_thd_ulong
sys_join_buffer_size
(
"join_buffer_size"
,
sys_var_thd_ulong
sys_join_buffer_size
(
"join_buffer_size"
,
...
@@ -665,11 +667,11 @@ struct show_var_st init_vars[]= {
...
@@ -665,11 +667,11 @@ struct show_var_st init_vars[]= {
{
sys_join_buffer_size
.
name
,
(
char
*
)
&
sys_join_buffer_size
,
SHOW_SYS
},
{
sys_join_buffer_size
.
name
,
(
char
*
)
&
sys_join_buffer_size
,
SHOW_SYS
},
{
sys_key_buffer_size
.
name
,
(
char
*
)
&
sys_key_buffer_size
,
SHOW_SYS
},
{
sys_key_buffer_size
.
name
,
(
char
*
)
&
sys_key_buffer_size
,
SHOW_SYS
},
{
sys_key_cache_age_threshold
.
name
,
(
char
*
)
&
sys_key_cache_age_threshold
,
{
sys_key_cache_age_threshold
.
name
,
(
char
*
)
&
sys_key_cache_age_threshold
,
SHOW_SYS
},
SHOW_SYS
},
{
sys_key_cache_block_size
.
name
,
(
char
*
)
&
sys_key_cache_block_size
,
{
sys_key_cache_block_size
.
name
,
(
char
*
)
&
sys_key_cache_block_size
,
SHOW_SYS
},
SHOW_SYS
},
{
sys_key_cache_division_limit
.
name
,
(
char
*
)
&
sys_key_cache_division_limit
,
{
sys_key_cache_division_limit
.
name
,
(
char
*
)
&
sys_key_cache_division_limit
,
SHOW_SYS
},
SHOW_SYS
},
{
"language"
,
language
,
SHOW_CHAR
},
{
"language"
,
language
,
SHOW_CHAR
},
{
"large_files_support"
,
(
char
*
)
&
opt_large_files
,
SHOW_BOOL
},
{
"large_files_support"
,
(
char
*
)
&
opt_large_files
,
SHOW_BOOL
},
{
sys_license
.
name
,
(
char
*
)
&
sys_license
,
SHOW_SYS
},
{
sys_license
.
name
,
(
char
*
)
&
sys_license
,
SHOW_SYS
},
...
@@ -833,15 +835,11 @@ bool sys_var_str::check(THD *thd, set_var *var)
...
@@ -833,15 +835,11 @@ bool sys_var_str::check(THD *thd, set_var *var)
bool
update_sys_var_str
(
sys_var_str
*
var_str
,
rw_lock_t
*
var_mutex
,
bool
update_sys_var_str
(
sys_var_str
*
var_str
,
rw_lock_t
*
var_mutex
,
set_var
*
var
)
set_var
*
var
)
{
{
char
*
res
=
0
,
*
old_value
;
char
*
res
=
0
,
*
old_value
=
(
char
*
)(
var
?
var
->
value
->
str_value
.
ptr
()
:
0
);
uint
new_length
=
0
;
uint
new_length
=
(
var
?
var
->
value
->
str_value
.
length
()
:
0
);
/* If the string is "", delete old init command */
if
(
!
old_value
)
old_value
=
""
;
if
(
var
&&
(
new_length
=
var
->
value
->
str_value
.
length
()))
if
(
!
(
res
=
my_strdup_with_length
(
old_value
,
new_length
,
MYF
(
0
))))
{
return
1
;
if
(
!
(
res
=
my_strdup_with_length
((
byte
*
)
var
->
value
->
str_value
.
ptr
(),
new_length
,
MYF
(
0
))))
return
1
;
}
/*
/*
Replace the old value in such a way that the any thread using
Replace the old value in such a way that the any thread using
the value will work.
the value will work.
...
...
sql/set_var.h
View file @
7411ac19
...
@@ -139,8 +139,9 @@ class sys_var_str :public sys_var
...
@@ -139,8 +139,9 @@ class sys_var_str :public sys_var
sys_var_str
(
const
char
*
name_arg
,
sys_var_str
(
const
char
*
name_arg
,
sys_check_func
check_func_arg
,
sys_check_func
check_func_arg
,
sys_update_func
update_func_arg
,
sys_update_func
update_func_arg
,
sys_set_default_func
set_default_func_arg
)
sys_set_default_func
set_default_func_arg
,
:
sys_var
(
name_arg
),
check_func
(
check_func_arg
),
char
*
value_arg
)
:
sys_var
(
name_arg
),
check_func
(
check_func_arg
),
value
(
value_arg
),
update_func
(
update_func_arg
),
set_default_func
(
set_default_func_arg
)
update_func
(
update_func_arg
),
set_default_func
(
set_default_func_arg
)
{}
{}
bool
check
(
THD
*
thd
,
set_var
*
var
);
bool
check
(
THD
*
thd
,
set_var
*
var
);
...
...
sql/slave.cc
View file @
7411ac19
...
@@ -3188,7 +3188,7 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME,
...
@@ -3188,7 +3188,7 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME,
llstr
(
rli
->
group_relay_log_pos
,
llbuff1
));
llstr
(
rli
->
group_relay_log_pos
,
llbuff1
));
/* execute init_slave variable */
/* execute init_slave variable */
if
(
sys_init_slave
.
value
)
if
(
sys_init_slave
.
value
_length
)
{
{
execute_init_command
(
thd
,
&
sys_init_slave
,
&
LOCK_sys_init_slave
);
execute_init_command
(
thd
,
&
sys_init_slave
,
&
LOCK_sys_init_slave
);
if
(
thd
->
query_error
)
if
(
thd
->
query_error
)
...
...
sql/sql_parse.cc
View file @
7411ac19
...
@@ -1000,7 +1000,7 @@ pthread_handler_decl(handle_one_connection,arg)
...
@@ -1000,7 +1000,7 @@ pthread_handler_decl(handle_one_connection,arg)
net
->
compress
=
1
;
// Use compression
net
->
compress
=
1
;
// Use compression
thd
->
version
=
refresh_version
;
thd
->
version
=
refresh_version
;
if
(
sys_init_connect
.
value
&&
!
(
thd
->
master_access
&
SUPER_ACL
))
if
(
sys_init_connect
.
value
_length
&&
!
(
thd
->
master_access
&
SUPER_ACL
))
{
{
execute_init_command
(
thd
,
&
sys_init_connect
,
&
LOCK_sys_init_connect
);
execute_init_command
(
thd
,
&
sys_init_connect
,
&
LOCK_sys_init_connect
);
if
(
thd
->
query_error
)
if
(
thd
->
query_error
)
...
...
support-files/my-innodb-heavy-4G.cnf.sh
View file @
7411ac19
...
@@ -71,7 +71,7 @@ max_connections = 100
...
@@ -71,7 +71,7 @@ max_connections = 100
# the host will be blocked from connecting to the MySQL server until
# the host will be blocked from connecting to the MySQL server until
# "FLUSH HOSTS" has been run or the server was restarted. Invalid
# "FLUSH HOSTS" has been run or the server was restarted. Invalid
# passwords and other errors during the connect phase result in
# passwords and other errors during the connect phase result in
# increasing this value. See the "Aborted_
C
onnects" status variable for
# increasing this value. See the "Aborted_
c
onnects" status variable for
# global counter.
# global counter.
max_connect_errors
=
10
max_connect_errors
=
10
...
@@ -111,14 +111,14 @@ max_heap_table_size = 64M
...
@@ -111,14 +111,14 @@ max_heap_table_size = 64M
# Sort buffer is used to perform sorts for some ORDER BY and GROUP BY
# Sort buffer is used to perform sorts for some ORDER BY and GROUP BY
# queries. If sorted data does not fit into the sort buffer, a disk
# queries. If sorted data does not fit into the sort buffer, a disk
# based merge sort is used instead - See
"sort_merge_passes". Allocated
# based merge sort is used instead - See
the "Sort_merge_passes"
# per thread if sort is needed.
#
status variable. Allocated
per thread if sort is needed.
sort_buffer_size
=
8M
sort_buffer_size
=
8M
# This buffer is used for the optimization of full JOINs (JOINs without
# This buffer is used for the optimization of full JOINs (JOINs without
# indexes). Such JOINs are very bad for performance in most cases
# indexes). Such JOINs are very bad for performance in most cases
# anyway, but setting this variable to a large value reduces the
# anyway, but setting this variable to a large value reduces the
# performance impact. See the "
s
elect_full_join" status variable for a
# performance impact. See the "
S
elect_full_join" status variable for a
# count of full JOINs. Allocated per thread if full join is found
# count of full JOINs. Allocated per thread if full join is found
join_buffer_size
=
8M
join_buffer_size
=
8M
...
...
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