Commit 2b8527e9 authored by unknown's avatar unknown
Browse files

Merge lmy004.:/work/mysql-5.1-release 

into lmy004.:/work/mysql-5.1-release-17619-try3
parents d78ee0ab 749f1832

mysql-test/r/log_tables.result

+6 −6
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ use mysql; 
truncate table general_log;

select * from general_log;

event_time	user_host	thread_id	server_id	command_type	argument

TIMESTAMP	root[root] @ localhost []	1	1	Query	select * from general_log

TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	select * from general_log

truncate table 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

truncate table general_log;

select * from general_log where argument like '%general_log%';

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	root[root] @ localhost []	THREAD_ID	1	Query	select * from general_log where argument like '%general_log%'

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 ("New DB connection was registered", "Connect");
@@ -59,10 +59,10 @@ create table bug16905 (s char(15) character set utf8 default 'пусто'); 
insert into bug16905 values ('новое');

select * from mysql.general_log;

event_time	user_host	thread_id	server_id	command_type	argument

TIMESTAMP	root[root] @ localhost []	2	1	Query	set names utf8

TIMESTAMP	root[root] @ localhost []	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	root[root] @ localhost []	2	1	Query	select * from mysql.general_log

TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	set names utf8

TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	create table bug16905 (s char(15) character set utf8 default 'пусто')

TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	insert into bug16905 values ('новое')

TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	select * from mysql.general_log

drop table bug16905;

truncate table mysql.slow_log;

set session long_query_time=1;

mysql-test/t/log_tables.test

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ use mysql; 
#



truncate table general_log;

--replace_column 1 TIMESTAMP

--replace_column 1 TIMESTAMP 3 THREAD_ID

select * from general_log;

truncate table slow_log;

--replace_column 1 TIMESTAMP
@@ -31,7 +31,7 @@ select * from slow_log; 
#



truncate table general_log;

--replace_column 1 TIMESTAMP

--replace_column 1 TIMESTAMP 3 THREAD_ID

select * from general_log where argument like '%general_log%';
@@ -156,7 +156,7 @@ truncate table mysql.general_log; 
set names utf8;

create table bug16905 (s char(15) character set utf8 default 'пусто');

insert into bug16905 values ('новое');

--replace_column 1 TIMESTAMP

--replace_column 1 TIMESTAMP 3 THREAD_ID

select * from mysql.general_log;

drop table bug16905;