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
dd816425
Commit
dd816425
authored
18 years ago
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.
parent
e7c78a04
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
mysql-test/r/events_logs_tests.result
mysql-test/r/events_logs_tests.result
+3
-3
mysql-test/t/events_logs_tests.test
mysql-test/t/events_logs_tests.test
+5
-2
No files found.
mysql-test/r/events_logs_tests.result
View file @
dd816425
...
...
@@ -19,7 +19,7 @@ SET GLOBAL event_scheduler=1;
"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"
call select_general_log();
user_host argument
root[root] @ localhost [localhost]
SELect 'alabala', sleep(3) from dual
USER_HOST
SELect 'alabala', sleep(3) from dual
DROP PROCEDURE select_general_log;
DROP EVENT log_general;
SET GLOBAL event_scheduler=2;
...
...
@@ -43,7 +43,7 @@ SLEEP(2)
0
SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
user_host query_time db sql_text
root[root] @ localhost []
SLEEPVAL events_test SELECT SLEEP(2)
USER_HOST
SLEEPVAL events_test SELECT SLEEP(2)
TRUNCATE mysql.slow_log;
CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);
"This won't go to the slow log"
...
...
@@ -76,7 +76,7 @@ slo_val val
"Check slow log. Should see 1 row because 4 is over the threshold of 3 for GLOBAL, though under SESSION which is 10"
SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
user_host query_time db sql_text
root[root] @ localhost [localhost]
SLEEPVAL events_test INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2)
USER_HOST
SLEEPVAL events_test INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2)
DROP EVENT long_event2;
SET GLOBAL long_query_time =@old_global_long_query_time;
SET SESSION long_query_time =@old_session_long_query_time;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/events_logs_tests.test
View file @
dd816425
...
...
@@ -14,11 +14,13 @@ SET GLOBAL event_scheduler=2;
create
event
log_general
on
schedule
every
1
minute
do
SELect
'alabala'
,
sleep
(
3
)
from
dual
;
TRUNCATE
mysql
.
general_log
;
--
echo
"1 row, the current statement!"
--
replace_column
1
USER_HOST
call
select_general_log
();
SET
GLOBAL
event_scheduler
=
1
;
--
echo
"Wait the scheduler to start"
--
echo
"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"
--
sleep
2
--
replace_column
1
USER_HOST
call
select_general_log
();
DROP
PROCEDURE
select_general_log
;
DROP
EVENT
log_general
;
...
...
@@ -50,13 +52,14 @@ SET @old_session_long_query_time:=@@long_query_time;
SHOW
VARIABLES
LIKE
'log_slow_queries'
;
DROP
FUNCTION
get_value
;
TRUNCATE
mysql
.
slow_log
;
--
replace_column
1
USER_HOST
SELECT
user_host
,
query_time
,
db
,
sql_text
FROM
mysql
.
slow_log
;
--
echo
"Set new values"
SET
GLOBAL
long_query_time
=
4
;
SET
SESSION
long_query_time
=
1
;
--
echo
"Check that logging is working"
SELECT
SLEEP
(
2
);
--
replace_
regex
/
00
:
00
:
0
[
2
-
4
]
/
SLEEPVAL
/
--
replace_
column
1
USER_HOST
2
SLEEPVAL
SELECT
user_host
,
query_time
,
db
,
sql_text
FROM
mysql
.
slow_log
;
TRUNCATE
mysql
.
slow_log
;
CREATE
TABLE
slow_event_test
(
slo_val
tinyint
,
val
tinyint
);
...
...
@@ -81,7 +84,7 @@ CREATE EVENT long_event2 ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_te
--
echo
"Check our table. Should see 2 rows"
SELECT
*
FROM
slow_event_test
;
--
echo
"Check slow log. Should see 1 row because 4 is over the threshold of 3 for GLOBAL, though under SESSION which is 10"
--
replace_
regex
/
00
:
00
:
0
[
2
-
4
]
/
SLEEPVAL
/
--
replace_
column
1
USER_HOST
2
SLEEPVAL
SELECT
user_host
,
query_time
,
db
,
sql_text
FROM
mysql
.
slow_log
;
DROP
EVENT
long_event2
;
SET
GLOBAL
long_query_time
=@
old_global_long_query_time
;
...
...
This diff is collapsed.
Click to expand it.
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