Bug #20004: log_tables fails on Windows due to output differences

  This test included hostname information in the output, which varies
  between platforms.


mysql-test/r/log_tables.result:
  Update results
mysql-test/t/log_tables.test:
  Replace user_host selected from logs to avoid platform differences.
  Also, fix use of replace_column in test for bug 17600.

1 files changed, 13 insertions, 13 deletions

diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 2164c18823f..08b1d473186 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -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	USER_HOST	1	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	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));
 insert into join_test values ("User performed a usual SQL query", "Query");
 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
 on (mysql.general_log.command_type = join_test.command_type);
 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	root[root] @ localhost []	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	root[root] @ localhost []	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	root[root] @ localhost []	select verbose_comment, user_host, argument
+User performed a usual SQL query	USER_HOST	select * from general_log where argument like '%general_log%'
+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	USER_HOST	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 ("New DB connection was registered", "Connect")
+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	USER_HOST	select verbose_comment, user_host, argument
 from  mysql.general_log join join_test
 on (mysql.general_log.command_type = join_test.command_type)
 drop table join_test;
@@ -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	USER_HOST	2	1	Query	set names utf8
+TIMESTAMP	USER_HOST	2	1	Query	create table bug16905 (s char(15) character set utf8 default 'пусто')
+TIMESTAMP	USER_HOST	2	1	Query	insert into bug16905 values ('новое')
+TIMESTAMP	USER_HOST	2	1	Query	select * from mysql.general_log
 drop table bug16905;
 truncate table mysql.slow_log;
 set session long_query_time=1;
@@ -71,4 +71,4 @@ sleep(2)
 0
 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
-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)