database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.1-20004

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
This commit is contained in:
unknown
2006-05-22 13:21:50 -07:00
parent 261a42b8d0 5b2cade4fa
commit c8fd8a8258
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/r/log_tables.result
View File

@ -2,14 +2,14 @@ use mysql;
truncate table general_log; truncate table general_log;
select * from general_log; select * from general_log;
event_time user_host thread_id server_id command_type argument event_time user_host thread_id server_id command_type argument
TIMESTAMP root[root] @ localhost [] 1 1 Query select * from general_log TIMESTAMP USER_HOST 1 1 Query select * from general_log
truncate table slow_log; truncate table slow_log;
select * from slow_log; select * from slow_log;
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
truncate table general_log; truncate table general_log;
select * from general_log where argument like '%general_log%'; select * from general_log where argument like '%general_log%';
event_time user_host thread_id server_id command_type argument event_time user_host thread_id server_id command_type argument
TIMESTAMP root[root] @ localhost [] 1 1 Query select * from general_log where argument like '%general_log%' TIMESTAMP USER_HOST 1 1 Query select * from general_log where argument like '%general_log%'
create table join_test (verbose_comment varchar (80), command_type varchar(64)); create table join_test (verbose_comment varchar (80), command_type varchar(64));
insert into join_test values ("User performed a usual SQL query", "Query"); insert into join_test values ("User performed a usual SQL query", "Query");
insert into join_test values ("New DB connection was registered", "Connect"); insert into join_test values ("New DB connection was registered", "Connect");
@ -18,12 +18,12 @@ select verbose_comment, user_host, argument
from mysql.general_log join join_test from mysql.general_log join join_test
on (mysql.general_log.command_type = join_test.command_type); on (mysql.general_log.command_type = join_test.command_type);
verbose_comment user_host argument verbose_comment user_host argument
User performed a usual SQL query root[root] @ localhost [] select * from general_log where argument like '%general_log%' User performed a usual SQL query USER_HOST select * from general_log where argument like '%general_log%'
User performed a usual SQL query root[root] @ localhost [] create table join_test (verbose_comment varchar (80), command_type varchar(64)) User performed a usual SQL query USER_HOST create table join_test (verbose_comment varchar (80), command_type varchar(64))
User performed a usual SQL query root[root] @ localhost [] insert into join_test values ("User performed a usual SQL query", "Query") User performed a usual SQL query USER_HOST insert into join_test values ("User performed a usual SQL query", "Query")
User performed a usual SQL query root[root] @ localhost [] insert into join_test values ("New DB connection was registered", "Connect") User performed a usual SQL query USER_HOST insert into join_test values ("New DB connection was registered", "Connect")
User performed a usual SQL query root[root] @ localhost [] insert into join_test values ("Get the table info", "Field List") User performed a usual SQL query USER_HOST insert into join_test values ("Get the table info", "Field List")
User performed a usual SQL query root[root] @ localhost [] select verbose_comment, user_host, argument User performed a usual SQL query USER_HOST select verbose_comment, user_host, argument
from mysql.general_log join join_test from mysql.general_log join join_test
on (mysql.general_log.command_type = join_test.command_type) on (mysql.general_log.command_type = join_test.command_type)
drop table join_test; drop table join_test;
@ -59,10 +59,10 @@ create table bug16905 (s char(15) character set utf8 default 'пусто');
insert into bug16905 values ('новое'); insert into bug16905 values ('новое');
select * from mysql.general_log; select * from mysql.general_log;
event_time user_host thread_id server_id command_type argument event_time user_host thread_id server_id command_type argument
TIMESTAMP root[root] @ localhost [] 2 1 Query set names utf8 TIMESTAMP USER_HOST 2 1 Query set names utf8
TIMESTAMP root[root] @ localhost [] 2 1 Query create table bug16905 (s char(15) character set utf8 default 'пусто') TIMESTAMP USER_HOST 2 1 Query create table bug16905 (s char(15) character set utf8 default 'пусто')
TIMESTAMP root[root] @ localhost [] 2 1 Query insert into bug16905 values ('новое') TIMESTAMP USER_HOST 2 1 Query insert into bug16905 values ('новое')
TIMESTAMP root[root] @ localhost [] 2 1 Query select * from mysql.general_log TIMESTAMP USER_HOST 2 1 Query select * from mysql.general_log
drop table bug16905; drop table bug16905;
truncate table mysql.slow_log; truncate table mysql.slow_log;
set session long_query_time=1; set session long_query_time=1;
@ -71,4 +71,4 @@ sleep(2)
0 0
select * from mysql.slow_log; select * from mysql.slow_log;
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
TIMESTAMP, root[root] @ localhost [] USER_HOST, QUERY_TIME 1 0 test 0 0 1 select sleep(2) TIMESTAMP USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 select sleep(2)

11
mysql-test/t/log_tables.test
View File

@ -16,10 +16,10 @@ use mysql;
# #
truncate table general_log; truncate table general_log;
--replace_column 1 TIMESTAMP --replace_column 1 TIMESTAMP 2 USER_HOST
select * from general_log; select * from general_log;
truncate table slow_log; truncate table slow_log;
--replace_column 1 TIMESTAMP --replace_column 1 TIMESTAMP 2 USER_HOST
select * from slow_log; select * from slow_log;
# #
@ -31,7 +31,7 @@ select * from slow_log;
# #
truncate table general_log; truncate table general_log;
--replace_column 1 TIMESTAMP --replace_column 1 TIMESTAMP 2 USER_HOST
select * from general_log where argument like '%general_log%'; select * from general_log where argument like '%general_log%';
@ -47,6 +47,7 @@ insert into join_test values ("User performed a usual SQL query", "Query");
insert into join_test values ("New DB connection was registered", "Connect"); insert into join_test values ("New DB connection was registered", "Connect");
insert into join_test values ("Get the table info", "Field List"); insert into join_test values ("Get the table info", "Field List");
--replace_column 2 USER_HOST
select verbose_comment, user_host, argument select verbose_comment, user_host, argument
from mysql.general_log join join_test from mysql.general_log join join_test
on (mysql.general_log.command_type = join_test.command_type); on (mysql.general_log.command_type = join_test.command_type);
@ -156,7 +157,7 @@ truncate table mysql.general_log;
set names utf8; set names utf8;
create table bug16905 (s char(15) character set utf8 default 'пусто'); create table bug16905 (s char(15) character set utf8 default 'пусто');
insert into bug16905 values ('новое'); insert into bug16905 values ('новое');
--replace_column 1 TIMESTAMP --replace_column 1 TIMESTAMP 2 USER_HOST
select * from mysql.general_log; select * from mysql.general_log;
drop table bug16905; drop table bug16905;
@ -167,7 +168,7 @@ drop table bug16905;
truncate table mysql.slow_log; truncate table mysql.slow_log;
set session long_query_time=1; set session long_query_time=1;
select sleep(2); select sleep(2);
--replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
select * from mysql.slow_log; select * from mysql.slow_log;
# kill all connections # kill all connections