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
7290fa2f
Commit
7290fa2f
authored
Aug 30, 2006
by
kostja@bodhi.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
parent
ebb70704
Changes
13
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
965 additions
and
341 deletions
+965
-341
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+769
-34
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+12
-251
mysql-test/r/grant.result
mysql-test/r/grant.result
+26
-1
mysql-test/r/im_cmd_line.result
mysql-test/r/im_cmd_line.result
+7
-0
mysql-test/r/im_instance_conf.result
mysql-test/r/im_instance_conf.result
+7
-11
mysql-test/r/sp.result
mysql-test/r/sp.result
+135
-12
mysql-test/t/grant.test
mysql-test/t/grant.test
+2
-1
mysql-test/t/im_cmd_line.imtest
mysql-test/t/im_cmd_line.imtest
+1
-1
mysql-test/t/im_instance_conf.imtest
mysql-test/t/im_instance_conf.imtest
+1
-24
sql/field.cc
sql/field.cc
+2
-2
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+2
-2
sql/sp_head.cc
sql/sp_head.cc
+0
-1
sql/sp_head.h
sql/sp_head.h
+1
-1
No files found.
mysql-test/lib/mtr_process.pl
View file @
7290fa2f
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
7290fa2f
...
@@ -344,7 +344,7 @@ sub snapshot_setup ();
...
@@ -344,7 +344,7 @@ sub snapshot_setup ();
sub
executable_setup
();
sub
executable_setup
();
sub
environment_setup
();
sub
environment_setup
();
sub
kill_running_server
();
sub
kill_running_server
();
sub
kill_and_cleanup
();
sub
cleanup_stale_files
();
sub
check_ssl_support
();
sub
check_ssl_support
();
sub
check_running_as_root
();
sub
check_running_as_root
();
sub
check_ndbcluster_support
();
sub
check_ndbcluster_support
();
...
@@ -368,8 +368,6 @@ sub ndb_mgmd_start ($);
...
@@ -368,8 +368,6 @@ sub ndb_mgmd_start ($);
sub
mysqld_start
($$$);
sub
mysqld_start
($$$);
sub
mysqld_arguments
($$$$$);
sub
mysqld_arguments
($$$$$);
sub
stop_all_servers
();
sub
stop_all_servers
();
sub
im_start
($$);
sub
im_stop
($$);
sub
run_mysqltest
($);
sub
run_mysqltest
($);
sub
usage
($);
sub
usage
($);
...
@@ -1454,14 +1452,13 @@ sub kill_running_server () {
...
@@ -1454,14 +1452,13 @@ sub kill_running_server () {
mtr_report
("
Killing Possible Leftover Processes
");
mtr_report
("
Killing Possible Leftover Processes
");
mkpath
("
$opt_vardir
/log
");
# Needed for mysqladmin log
mkpath
("
$opt_vardir
/log
");
# Needed for mysqladmin log
mtr_kill_leftovers
();
mtr_kill_leftovers
();
}
}
}
}
sub
kill_and_cleanup
()
{
sub
cleanup_stale_files
()
{
kill_running_server
();
mtr_report
("
Removing Stale Files
");
mtr_report
("
Removing Stale Files
");
...
@@ -1998,14 +1995,12 @@ sub run_suite () {
...
@@ -1998,14 +1995,12 @@ sub run_suite () {
sub
initialize_servers
()
{
sub
initialize_servers
()
{
if
(
!
$glob_use_running_server
)
if
(
!
$glob_use_running_server
)
{
if
(
$opt_start_dirty
)
{
{
kill_running_server
();
kill_running_server
();
}
else
unless
(
$opt_start_dirty
)
{
{
kill_and_cleanup
();
cleanup_stale_files
();
mysql_install_db
();
mysql_install_db
();
if
(
$opt_force
)
if
(
$opt_force
)
{
{
...
@@ -2397,10 +2392,9 @@ sub run_testcase ($) {
...
@@ -2397,10 +2392,9 @@ sub run_testcase ($) {
# Stop Instance Manager if we are processing an IM-test case.
# Stop Instance Manager if we are processing an IM-test case.
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
if
(
!
$glob_use_running_server
and
$tinfo
->
{'
component_id
'}
eq
'
im
'
and
if
(
!
$glob_use_running_server
and
$tinfo
->
{'
component_id
'}
eq
'
im
'
)
$instance_manager
->
{'
pid
'}
)
{
{
im_stop
(
$instance_manager
,
$tinfo
->
{'
name
'});
mtr_
im_stop
(
$instance_manager
,
$tinfo
->
{'
name
'});
}
}
}
}
...
@@ -2937,11 +2931,8 @@ sub stop_all_servers () {
...
@@ -2937,11 +2931,8 @@ sub stop_all_servers () {
print
"
Stopping All Servers
\n
";
print
"
Stopping All Servers
\n
";
if
(
$instance_manager
->
{'
pid
'}
)
{
print
"
Shutting-down Instance Manager
\n
";
print
"
Shutting-down Instance Manager
\n
";
im_stop
(
$instance_manager
,
"
stop_all_servers
");
mtr_im_stop
(
$instance_manager
,
"
stop_all_servers
");
}
my
%
admin_pids
;
# hash of admin processes that requests shutdown
my
%
admin_pids
;
# hash of admin processes that requests shutdown
my
@kill_pids
;
# list of processes to shutdown/kill
my
@kill_pids
;
# list of processes to shutdown/kill
...
@@ -3332,7 +3323,7 @@ sub run_testcase_start_servers($) {
...
@@ -3332,7 +3323,7 @@ sub run_testcase_start_servers($) {
im_create_defaults_file
(
$instance_manager
);
im_create_defaults_file
(
$instance_manager
);
im_start
(
$instance_manager
,
$tinfo
->
{
im_opts
});
mtr_
im_start
(
$instance_manager
,
$tinfo
->
{
im_opts
});
}
}
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
@@ -3396,236 +3387,6 @@ sub run_testcase_start_servers($) {
...
@@ -3396,236 +3387,6 @@ sub run_testcase_start_servers($) {
}
}
}
}
##############################################################################
#
# Instance Manager management routines.
#
##############################################################################
sub
im_start
($$)
{
my
$instance_manager
=
shift
;
my
$opts
=
shift
;
my
$args
;
mtr_init_args
(
\
$args
);
mtr_add_arg
(
$args
,
"
--defaults-file=%s
",
$instance_manager
->
{'
defaults_file
'});
if
(
$opt_debug
)
{
mtr_add_arg
(
$args
,
"
--debug=d:t:i:A,%s/log/im.trace
",
$opt_vardir_trace
);
}
foreach
my
$opt
(
@
{
$opts
})
{
mtr_add_arg
(
$args
,
$opt
);
}
$instance_manager
->
{'
pid
'}
=
mtr_spawn
(
$exe_im
,
# path to the executable
$args
,
# cmd-line args
'',
# stdin
$instance_manager
->
{'
path_log
'},
# stdout
$instance_manager
->
{'
path_err
'},
# stderr
'',
# pid file path (not used)
{
append_log_file
=>
1
}
# append log files
);
if
(
!
$instance_manager
->
{'
pid
'}
)
{
mtr_report
('
Could not start Instance Manager
');
return
;
}
# Instance Manager can be run in daemon mode. In this case, it creates
# several processes and the parent process, created by mtr_spawn(), exits just
# after start. So, we have to obtain Instance Manager PID from the PID file.
if
(
!
sleep_until_file_created
(
$instance_manager
->
{'
path_pid
'},
$instance_manager
->
{'
start_timeout
'},
-
1
))
# real PID is still unknown
{
mtr_report
("
Instance Manager PID file is missing
");
return
;
}
my
$pid
=
mtr_get_pid_from_file
(
$instance_manager
->
{'
path_pid
'});
$instance_manager
->
{'
pid
'}
=
$pid
;
mtr_verbose
("
im_start: pid:
$pid
");
}
sub
im_stop
($$)
{
my
$instance_manager
=
shift
;
my
$where
=
shift
;
# Obtain mysqld-process pids before we start stopping IM (it can delete pid
# files).
my
@mysqld_pids
=
();
my
$instances
=
$instance_manager
->
{'
instances
'};
push
(
@mysqld_pids
,
mtr_get_pid_from_file
(
$instances
->
[
0
]
->
{'
path_pid
'}))
if
-
r
$instances
->
[
0
]
->
{'
path_pid
'};
push
(
@mysqld_pids
,
mtr_get_pid_from_file
(
$instances
->
[
1
]
->
{'
path_pid
'}))
if
-
r
$instances
->
[
1
]
->
{'
path_pid
'};
# Re-read pid from the file, since during tests Instance Manager could have
# been restarted, so its pid could have been changed.
$instance_manager
->
{'
pid
'}
=
mtr_get_pid_from_file
(
$instance_manager
->
{'
path_pid
'})
if
-
f
$instance_manager
->
{'
path_pid
'};
if
(
-
f
$instance_manager
->
{'
path_angel_pid
'})
{
$instance_manager
->
{'
angel_pid
'}
=
mtr_get_pid_from_file
(
$instance_manager
->
{'
path_angel_pid
'})
}
else
{
$instance_manager
->
{'
angel_pid
'}
=
undef
;
}
# Inspired from mtr_stop_mysqld_servers().
start_reap_all
();
# Try graceful shutdown.
mtr_verbose
("
Stopping IM-main, pid:
$instance_manager
->{'pid'}
");
mtr_kill_process
(
$instance_manager
->
{'
pid
'},
'
TERM
',
10
);
# If necessary, wait for angel process to die.
my
$pid
=
$instance_manager
->
{'
angel_pid
'};
if
(
defined
$pid
)
{
mtr_verbose
("
Waiting for IM-angel to die, pid:
$pid
");
my
$total_attempts
=
10
;
for
(
my
$cur_attempt
=
1
;
$cur_attempt
<=
$total_attempts
;
++
$cur_attempt
)
{
unless
(
kill
(
0
,
$pid
))
{
mtr_verbose
("
IM-angel died.
");
last
;
}
sleep
(
1
);
}
}
# Check if all processes shutdown cleanly
my
$clean_shutdown
=
0
;
while
(
1
)
{
# Check that IM-main died.
if
(
kill
(
0
,
$instance_manager
->
{'
pid
'}))
{
mtr_debug
("
IM-main is still alive.
");
last
;
}
# Check that IM-angel died.
if
(
defined
$instance_manager
->
{'
angel_pid
'}
&&
kill
(
0
,
$instance_manager
->
{'
angel_pid
'}))
{
mtr_debug
("
IM-angel is still alive.
");
last
;
}
# Check that all guarded mysqld-instances died.
my
$guarded_mysqlds_dead
=
1
;
foreach
my
$pid
(
@mysqld_pids
)
{
if
(
kill
(
0
,
$pid
))
{
mtr_debug
("
Guarded mysqld (
$pid
) is still alive.
");
$guarded_mysqlds_dead
=
0
;
last
;
}
}
last
unless
$guarded_mysqlds_dead
;
# Ok, all necessary processes are dead.
$clean_shutdown
=
1
;
last
;
}
# Kill leftovers (the order is important).
if
(
$clean_shutdown
)
{
mtr_debug
("
IM-shutdown was clean -- all processed died.
");
}
else
{
mtr_debug
("
IM failed to shutdown gracefully. We have to clean the mess...
");
}
unless
(
$clean_shutdown
)
{
if
(
defined
$instance_manager
->
{'
angel_pid
'})
{
mtr_verbose
("
Killing IM-angel, pid:
$instance_manager
->{'angel_pid'}
");
mtr_kill_process
(
$instance_manager
->
{'
angel_pid
'},
'
KILL
',
10
)
}
mtr_verbose
("
Killing IM-main, pid:
$instance_manager
->{'pid'}
");
mtr_kill_process
(
$instance_manager
->
{'
pid
'},
'
KILL
',
10
);
# Shutdown managed mysqld-processes. Some of them may be nonguarded, so IM
# will not stop them on shutdown. So, we should firstly try to end them
# legally.
mtr_verbose
("
Killing guarded mysqld(s)
"
.
join
("
",
@mysqld_pids
));
mtr_kill_processes
(
\
@mysqld_pids
);
# Complain in error log so that a warning will be shown.
#
# TODO: unless BUG#20761 is fixed, we will print the warning
# to stdout, so that it can be seen on console and does not
# produce pushbuild error.
# my $errlog= "$opt_vardir/log/mysql-test-run.pl.err";
#
# open (ERRLOG, ">>$errlog") ||
# mtr_error("Can not open error log ($errlog)");
#
# my $ts= localtime();
# print ERRLOG
# "Warning: [$ts] Instance Manager did not shutdown gracefully.\n";
#
# close ERRLOG;
my
$ts
=
localtime
();
print
"
[
$where
] Warning: [
$ts
] Instance Manager did not shutdown gracefully.
\n
";
}
# That's all.
stop_reap_all
();
$instance_manager
->
{'
pid
'}
=
undef
;
$instance_manager
->
{'
angel_pid
'}
=
undef
;
}
#
#
# Run include/check-testcase.test
# Run include/check-testcase.test
# Before a testcase, run in record mode, save result file to var
# Before a testcase, run in record mode, save result file to var
...
...
mysql-test/r/grant.result
View file @
7290fa2f
...
@@ -945,6 +945,31 @@ DROP TABLE mysqltest3.t_nn;
...
@@ -945,6 +945,31 @@ DROP TABLE mysqltest3.t_nn;
DROP DATABASE mysqltest3;
DROP DATABASE mysqltest3;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mysqltest_1'@'localhost';
REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mysqltest_1'@'localhost';
DROP USER 'mysqltest_1'@'localhost';
DROP USER 'mysqltest_1'@'localhost';
use test;
create user mysqltest1_thisisreallytoolong;
create user mysqltest1_thisisreallytoolong;
ERROR HY000: Operation CREATE USER failed for 'mysqltest1_thisisreallytoolong'@'%'
ERROR HY000: String 'mysqltest1_thisisreallytoolong' is too long for user name (should be no longer than 16)
GRANT CREATE ON mysqltest.* TO 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
REVOKE CREATE ON mysqltest.* FROM 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
GRANT CREATE ON t1 TO 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
REVOKE CREATE ON t1 FROM 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
GRANT EXECUTE ON PROCEDURE p1 TO 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
End of 5.0 tests
End of 5.0 tests
mysql-test/r/im_cmd_line.result
View file @
7290fa2f
SHOW VARIABLES LIKE 'server_id';
Variable_name Value
server_id 1
SHOW INSTANCES;
instance_name state
mysqld1 starting
mysqld2 offline
--> Listing users...
--> Listing users...
im_admin
im_admin
...
...
mysql-test/r/im_instance_conf.result
View file @
7290fa2f
--------------------------------------------------------------------
SHOW VARIABLES LIKE 'server_id';
server_id = 1
Variable_name Value
server_id = 2
server_id 1
--------------------------------------------------------------------
SHOW INSTANCES;
SHOW INSTANCES;
instance_name state
instance_name state
mysqld1 online
mysqld1 online
mysqld2 offline
mysqld2 offline
--------------------------------------------------------------------
---> connection: mysql1_con
server_id = 1
SHOW VARIABLES LIKE 'server_id';
server_id = 2
Variable_name Value
--------------------------------------------------------------------
server_id 1
---> connection: default
CREATE INSTANCE mysqld3
CREATE INSTANCE mysqld3
server_id = 3,
server_id = 3,
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
...
...
mysql-test/r/sp.result
View file @
7290fa2f
...
@@ -4872,8 +4872,6 @@ declare continue handler for sqlexception begin end;
...
@@ -4872,8 +4872,6 @@ declare continue handler for sqlexception begin end;
select no_such_function();
select no_such_function();
end|
end|
call bug18787()|
call bug18787()|
no_such_function()
NULL
drop procedure bug18787|
drop procedure bug18787|
create database bug18344_012345678901|
create database bug18344_012345678901|
use bug18344_012345678901|
use bug18344_012345678901|
...
@@ -5223,20 +5221,125 @@ greek greek_general_ci
...
@@ -5223,20 +5221,125 @@ greek greek_general_ci
use test|
use test|
DROP DATABASE mysqltest1|
DROP DATABASE mysqltest1|
drop table if exists t3|
drop table if exists t3|
drop database if exists mysqltest1|
drop table if exists t4|
drop procedure if exists bug8153_subselect|
drop procedure if exists bug8153_subselect_a|
drop procedure if exists bug8153_subselect_b|
drop procedure if exists bug8153_proc_a|
drop procedure if exists bug8153_proc_b|
create table t3 (a int)|
create table t3 (a int)|
insert into t3 (a) values (1), (2)|
create table t4 (a int)|
create database mysqltest1|
insert into t3 values (1), (1), (2), (3)|
use mysqltest1|
insert into t4 values (1), (1)|
drop database mysqltest1|
create procedure bug8153_subselect()
select database()|
begin
database()
declare continue handler for sqlexception
NULL
begin
select * from (select 1 as a) as t1 natural join (select * from test.t3) as t2|
select 'statement failed';
end;
update t3 set a=a+1 where (select a from t4 where a=1) is null;
select 'statement after update';
end|
call bug8153_subselect()|
statement failed
statement failed
statement after update
statement after update
select * from t3|
a
a
1
1
use test|
1
2
3
call bug8153_subselect()|
statement failed
statement failed
statement after update
statement after update
select * from t3|
a
1
1
2
3
drop procedure bug8153_subselect|
create procedure bug8153_subselect_a()
begin
declare continue handler for sqlexception
begin
select 'in continue handler';
end;
select 'reachable code a1';
call bug8153_subselect_b();
select 'reachable code a2';
end|
create procedure bug8153_subselect_b()
begin
select 'reachable code b1';
update t3 set a=a+1 where (select a from t4 where a=1) is null;
select 'unreachable code b2';
end|
call bug8153_subselect_a()|
reachable code a1
reachable code a1
reachable code b1
reachable code b1
in continue handler
in continue handler
reachable code a2
reachable code a2
select * from t3|
a
1
1
2
3
call bug8153_subselect_a()|
reachable code a1
reachable code a1
reachable code b1
reachable code b1
in continue handler
in continue handler
reachable code a2
reachable code a2
select * from t3|
a
1
1
2
3
drop procedure bug8153_subselect_a|
drop procedure bug8153_subselect_b|
create procedure bug8153_proc_a()
begin
declare continue handler for sqlexception
begin
select 'in continue handler';
end;
select 'reachable code a1';
call bug8153_proc_b();
select 'reachable code a2';
end|
create procedure bug8153_proc_b()
begin
select 'reachable code b1';
select no_such_function();
select 'unreachable code b2';
end|
call bug8153_proc_a()|
reachable code a1
reachable code a1
reachable code b1
reachable code b1
in continue handler
in continue handler
reachable code a2
reachable code a2
drop procedure bug8153_proc_a|
drop procedure bug8153_proc_b|
drop table t3|
drop table t3|
drop table t4|
drop procedure if exists bug19862|
drop procedure if exists bug19862|
CREATE TABLE t11 (a INT)|
CREATE TABLE t11 (a INT)|
CREATE TABLE t12 (a INT)|
CREATE TABLE t12 (a INT)|
...
@@ -5256,5 +5359,25 @@ a
...
@@ -5256,5 +5359,25 @@ a
2
2
DROP TABLE t11, t12|
DROP TABLE t11, t12|
DROP FUNCTION bug19862|
DROP FUNCTION bug19862|
DROP PROCEDURE IF EXISTS bug16899_p1|
DROP FUNCTION IF EXISTS bug16899_f1|
CREATE DEFINER=1234567890abcdefGHIKL@localhost PROCEDURE bug16899_p1()
BEGIN
SET @a = 1;
END|
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
CREATE DEFINER=some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY
FUNCTION bug16899_f1() RETURNS INT
BEGIN
RETURN 1;
END|
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
drop procedure if exists bug21416|
create procedure bug21416() show create procedure bug21416|
call bug21416()|
Procedure sql_mode Create Procedure
bug21416 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug21416`()
show create procedure bug21416
drop procedure bug21416|
End of 5.0 tests
End of 5.0 tests
drop table t1,t2;
drop table t1,t2;
mysql-test/t/grant.test
View file @
7290fa2f
...
@@ -807,7 +807,8 @@ DROP DATABASE mysqltest3;
...
@@ -807,7 +807,8 @@ DROP DATABASE mysqltest3;
REVOKE
ALL
PRIVILEGES
,
GRANT
OPTION
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
ALL
PRIVILEGES
,
GRANT
OPTION
FROM
'mysqltest_1'
@
'localhost'
;
DROP
USER
'mysqltest_1'
@
'localhost'
;
DROP
USER
'mysqltest_1'
@
'localhost'
;
# restore the original database
use
test
;
#
#
# Bug #10668: CREATE USER does not enforce username length limit
# Bug #10668: CREATE USER does not enforce username length limit
...
...
mysql-test/t/im_cmd_line.imtest
View file @
7290fa2f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#
#
###########################################################################
###########################################################################
--source include/im_check_
os
.inc
--source include/im_check_
env
.inc
###########################################################################
###########################################################################
...
...
mysql-test/t/im_instance_conf.imtest
View file @
7290fa2f
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#
#
###########################################################################
###########################################################################
--source include/im_check_
os
.inc
--source include/im_check_
env
.inc
###########################################################################
###########################################################################
#
#
...
@@ -40,29 +40,6 @@
...
@@ -40,29 +40,6 @@
--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;
--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;
--echo --------------------------------------------------------------------
--echo --------------------------------------------------------------------
# Check that mysqld1 is reported as running.
--sleep 3
# should be longer than monitoring interval and enough to start instance.
SHOW INSTANCES;
# Check that the expected mysqld instance is actually run (check that we can
# connect and execute something).
--echo
--echo ---> connection: mysql1_con
--connect (mysql1_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
--connection mysql1_con
SHOW VARIABLES LIKE 'server_id';
--disconnect mysql1_con
--echo
--echo ---> connection: default
--connection default
###########################################################################
###########################################################################
#
#
# CREATE INSTANCE tests.
# CREATE INSTANCE tests.
...
...
sql/field.cc
View file @
7290fa2f
...
@@ -6302,7 +6302,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
...
@@ -6302,7 +6302,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
{
{
Field
*
field
;
Field
*
field
;
if
(
type
()
!=
MYSQL_TYPE_VAR_STRING
||
keep_type
)
if
(
type
()
!=
MYSQL_TYPE_VAR_STRING
||
keep_type
)
new_
field
=
Field
::
new_field
(
root
,
new_table
,
keep_type
);
field
=
Field
::
new_field
(
root
,
new_table
,
keep_type
);
else
if
((
field
=
new
Field_varstring
(
field_length
,
maybe_null
(),
field_name
,
else
if
((
field
=
new
Field_varstring
(
field_length
,
maybe_null
(),
field_name
,
new_table
->
s
,
charset
())))
new_table
->
s
,
charset
())))
{
{
...
@@ -6318,7 +6318,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
...
@@ -6318,7 +6318,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
not applicable. But we still need to preserve the original field
not applicable. But we still need to preserve the original field
metadata for the client-server protocol.
metadata for the client-server protocol.
*/
*/
new_
field
->
orig_table
=
orig_table
;
field
->
orig_table
=
orig_table
;
}
}
return
field
;
return
field
;
}
}
...
...
sql/item_cmpfunc.cc
View file @
7290fa2f
...
@@ -515,8 +515,8 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
...
@@ -515,8 +515,8 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
which would be transformed to:
which would be transformed to:
WHERE col= 'j'
WHERE col= 'j'
*/
*/
(
*
a
)
->
walk
(
&
Item
::
set_no_const_sub
,
(
byte
*
)
0
);
(
*
a
)
->
walk
(
&
Item
::
set_no_const_sub
,
FALSE
,
(
byte
*
)
0
);
(
*
b
)
->
walk
(
&
Item
::
set_no_const_sub
,
(
byte
*
)
0
);
(
*
b
)
->
walk
(
&
Item
::
set_no_const_sub
,
FALSE
,
(
byte
*
)
0
);
}
}
break
;
break
;
}
}
...
...
sql/sp_head.cc
View file @
7290fa2f
...
@@ -270,7 +270,6 @@ sp_get_flags_for_command(LEX *lex)
...
@@ -270,7 +270,6 @@ sp_get_flags_for_command(LEX *lex)
case
SQLCOM_CREATE_EVENT
:
case
SQLCOM_CREATE_EVENT
:
case
SQLCOM_ALTER_EVENT
:
case
SQLCOM_ALTER_EVENT
:
case
SQLCOM_DROP_EVENT
:
case
SQLCOM_DROP_EVENT
:
case
SQLCOM_FLUSH
:
case
SQLCOM_INSTALL_PLUGIN
:
case
SQLCOM_INSTALL_PLUGIN
:
case
SQLCOM_UNINSTALL_PLUGIN
:
case
SQLCOM_UNINSTALL_PLUGIN
:
flags
=
sp_head
::
HAS_COMMIT_OR_ROLLBACK
;
flags
=
sp_head
::
HAS_COMMIT_OR_ROLLBACK
;
...
...
sql/sp_head.h
View file @
7290fa2f
...
@@ -118,7 +118,7 @@ class sp_head :private Query_arena
...
@@ -118,7 +118,7 @@ class sp_head :private Query_arena
HAS_COMMIT_OR_ROLLBACK
=
128
,
HAS_COMMIT_OR_ROLLBACK
=
128
,
LOG_SLOW_STATEMENTS
=
256
,
// Used by events
LOG_SLOW_STATEMENTS
=
256
,
// Used by events
LOG_GENERAL_LOG
=
512
,
// Used by events
LOG_GENERAL_LOG
=
512
,
// Used by events
BINLOG_ROW_BASED_IF_MIXED
=
1024
BINLOG_ROW_BASED_IF_MIXED
=
1024
,
HAS_SQLCOM_RESET
=
2048
,
HAS_SQLCOM_RESET
=
2048
,
HAS_SQLCOM_FLUSH
=
4096
HAS_SQLCOM_FLUSH
=
4096
};
};
...
...
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