diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result
index df81f05fea5..43735243787 100644
--- a/mysql-test/r/log_state.result
+++ b/mysql-test/r/log_state.result
@@ -14,15 +14,15 @@ set global general_log= ON;
 create table t1(f1 int);
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	#	1	Query	create table t1(f1 int)
-TIMESTAMP	root[root] @ localhost []	#	1	Query	select * from mysql.general_log
+TIMESTAMP	USER_HOST	#	1	Query	create table t1(f1 int)
+TIMESTAMP	USER_HOST	#	1	Query	select * from mysql.general_log
 set global general_log= OFF;
 drop table t1;
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	#	1	Query	create table t1(f1 int)
-TIMESTAMP	root[root] @ localhost []	#	1	Query	select * from mysql.general_log
-TIMESTAMP	root[root] @ localhost []	#	1	Query	set global general_log= OFF
+TIMESTAMP	USER_HOST	#	1	Query	create table t1(f1 int)
+TIMESTAMP	USER_HOST	#	1	Query	select * from mysql.general_log
+TIMESTAMP	USER_HOST	#	1	Query	set global general_log= OFF
 set global general_log= ON;
 flush logs;
 show global variables
@@ -46,7 +46,7 @@ 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)
 show global variables
 where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
 Variable_name = 'general_log' or Variable_name = 'slow_query_log';
@@ -67,9 +67,9 @@ create table t1(f1 int);
 drop table t1;
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	#	1	Query	create table t1(f1 int)
-TIMESTAMP	root[root] @ localhost []	#	1	Query	drop table t1
-TIMESTAMP	root[root] @ localhost []	#	1	Query	select * from mysql.general_log
+TIMESTAMP	USER_HOST	#	1	Query	create table t1(f1 int)
+TIMESTAMP	USER_HOST	#	1	Query	drop table t1
+TIMESTAMP	USER_HOST	#	1	Query	select * from mysql.general_log
 set global general_log= OFF;
 truncate table mysql.general_log;
 select * from mysql.general_log;
@@ -151,5 +151,5 @@ set global general_log=ON;
 drop table t1;
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	#	1	Query	drop table t1
-TIMESTAMP	root[root] @ localhost []	#	1	Query	select * from mysql.general_log
+TIMESTAMP	USER_HOST	#	1	Query	drop table t1
+TIMESTAMP	USER_HOST	#	1	Query	select * from mysql.general_log
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index d3dec841dc1..41fbd068dce 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -11,11 +11,11 @@ Variable_name = 'general_log' or Variable_name = 'slow_query_log';
 flush logs;
 set global general_log= ON;
 create table t1(f1 int);
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 set global general_log= OFF;
 drop table t1;
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 set global general_log= ON;
 flush logs;
@@ -27,7 +27,7 @@ connect (con1,localhost,root,,);
 connection con1;
 set session long_query_time=1;
 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;
 connection default;
 
@@ -35,7 +35,7 @@ set global slow_query_log= ON;
 connection con1;
 set session long_query_time=1;
 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;
 disconnect con1;
 connection default;
@@ -54,11 +54,11 @@ set global general_log= ON;
 truncate table mysql.general_log;
 create table t1(f1 int);
 drop table t1;
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 set global general_log= OFF;
 truncate table mysql.general_log;
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 set global general_log= ON;
 show global variables
@@ -109,14 +109,14 @@ truncate table mysql.general_log;
 show variables like 'log_output';
 set global general_log=ON;
 create table t1(f1 int);
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 set global general_log=OFF;
 set global log_output="FILE,TABLE";
 show variables like 'log_output';
 set global general_log=ON;
 drop table t1;
---replace_column 1 TIMESTAMP 3 #
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
 select * from mysql.general_log;
 
 --enable_ps_protocol