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
d49d3637
Commit
d49d3637
authored
Dec 05, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
parents
6a842299
6308a5f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
mysql-test/r/log_tables.result
mysql-test/r/log_tables.result
+2
-1
mysql-test/t/log_tables.test
mysql-test/t/log_tables.test
+2
-1
No files found.
mysql-test/r/log_tables.result
View file @
d49d3637
...
...
@@ -605,6 +605,7 @@ DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
DROP DATABASE IF EXISTS `db_17876`;
SET GLOBAL general_log = @old_general_log_state;
SET GLOBAL slow_query_log = @old_slow_log_state;
select CONNECTION_ID() into @thread_id;
truncate table mysql.general_log;
set @old_general_log_state = @@global.general_log;
set global general_log = on;
...
...
@@ -711,7 +712,7 @@ set @lparam = "000 001 002 003 004 005 006 007 008 009"
prepare long_query from "select ? as long_query";
execute long_query using @lparam;
set global general_log = off;
select command_type, argument from mysql.general_log;
select command_type, argument from mysql.general_log
where thread_id = @thread_id
;
command_type argument
Query set @lparam = "000 001 002 003 004 005 006 007 008 009"
"010 011 012 013 014 015 016 017 018 019"
...
...
mysql-test/t/log_tables.test
View file @
d49d3637
...
...
@@ -811,6 +811,7 @@ SET GLOBAL slow_query_log = @old_slow_log_state;
# Bug#21557 entries in the general query log truncated at 1000 characters.
#
select
CONNECTION_ID
()
into
@
thread_id
;
truncate
table
mysql
.
general_log
;
set
@
old_general_log_state
=
@@
global
.
general_log
;
set
global
general_log
=
on
;
...
...
@@ -921,7 +922,7 @@ prepare long_query from "select ? as long_query";
execute
long_query
using
@
lparam
;
--
enable_result_log
set
global
general_log
=
off
;
select
command_type
,
argument
from
mysql
.
general_log
;
select
command_type
,
argument
from
mysql
.
general_log
where
thread_id
=
@
thread_id
;
deallocate
prepare
long_query
;
set
global
general_log
=
@
old_general_log_state
;
...
...
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