bk commit into 5.1 tree (jimw:1.2176)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2176 06/05/23 09:49:04 jimw@stripped +2 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  mysql-test/t/log_tables.test
    1.10 06/05/23 09:49:01 jimw@stripped +3 -6
    Merge conflict

  mysql-test/r/log_tables.result
    1.5 06/05/23 09:49:01 jimw@stripped +6 -12
    Merge conflict

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.4/mysql-test/r/log_tables.result	2006-05-22 11:34:37 -07:00
+++ 1.5/mysql-test/r/log_tables.result	2006-05-23 09:49:01 -07:00
@@ -2,14 +2,14 @@
 truncate table general_log;
 select * from general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	USER_HOST	1	1	Query	select * from general_log
+TIMESTAMP	USER_HOST	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	USER_HOST	1	1	Query	select * from general_log where argument like
'%general_log%'
+TIMESTAMP	USER_HOST	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 @@
 insert into bug16905 values ('новое');
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-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
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set names utf8
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	create table bug16905 (s char(15) character set
utf8 default 'пусто')
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	insert into bug16905 values ('новое')
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.general_log
 drop table bug16905;
 truncate table mysql.slow_log;
 set session long_query_time=1;

--- 1.9/mysql-test/t/log_tables.test	2006-05-22 11:34:37 -07:00
+++ 1.10/mysql-test/t/log_tables.test	2006-05-23 09:49:01 -07:00
@@ -16,7 +16,7 @@
 #
 
 truncate table general_log;
---replace_column 1 TIMESTAMP 2 USER_HOST
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from general_log;
 truncate table slow_log;
 --replace_column 1 TIMESTAMP 2 USER_HOST
@@ -31,7 +31,7 @@
 #
 
 truncate table general_log;
---replace_column 1 TIMESTAMP 2 USER_HOST
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from general_log where argument like '%general_log%';
 
 
@@ -157,7 +157,7 @@
 set names utf8;
 create table bug16905 (s char(15) character set utf8 default 'пусто');
 insert into bug16905 values ('новое');
---replace_column 1 TIMESTAMP 2 USER_HOST
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from mysql.general_log;
 drop table bug16905;