bk commit into 5.0 tree (msvensson:1.2444)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2007-02-26 09:16:22+01:00, msvensson@stripped +2 -0
  Workaround non portable use of "grep" and "cut" by loading the whole processlist
  into temporary table and selecting the correct row with SQL

  mysql-test/include/get_binlog_dump_thread_id.inc@stripped, 2007-02-26 09:16:21+01:00, msvensson@stripped +16 -3
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

  mysql-test/r/rpl_temporary.result@stripped, 2007-02-26 09:16:21+01:00, msvensson@stripped +10 -1
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.3/mysql-test/include/get_binlog_dump_thread_id.inc	2006-04-09 12:27:48 +02:00
+++ 1.4/mysql-test/include/get_binlog_dump_thread_id.inc	2007-02-26 09:16:21 +01:00
@@ -1,9 +1,22 @@
---exec $MYSQL test -e 'show processlist' | grep 'Binlog Dump' | cut -f1 > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
+--exec $MYSQL test -e "show processlist" > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
 --disable_warnings
 drop table if exists t999;
 --enable_warnings
-create temporary table t999 (f int);
+# Create a table to hold the process list
+create temporary table t999(
+  id int,
+  user char(255),
+  host char(255),
+  db char(255),
+  Command char(255),
+  time int,
+  State char(255),
+  info char(255)
+);
+# Load processlist into table, headers will create seom warnings
+--disable_warnings
 --replace_result $MYSQLTEST_VARDIR "."
 eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
-let $id = `select f from t999`;
+--enable_warnings
+let $id = `select Id from t999 where Command="Binlog Dump"`;
 drop table t999;

--- 1.26/mysql-test/r/rpl_temporary.result	2006-05-16 09:26:46 +02:00
+++ 1.27/mysql-test/r/rpl_temporary.result	2007-02-26 09:16:21 +01:00
@@ -92,7 +92,16 @@ create temporary table t3 (f int);
 create temporary table t4 (f int);
 create table t5 (f int);
 drop table if exists t999;
-create temporary table t999 (f int);
+create temporary table t999(
+id int,
+user char(255),
+host char(255),
+db char(255),
+Command char(255),
+time int,
+State char(255),
+info char(255)
+);
 LOAD DATA INFILE "./tmp/bl_dump_thread_id" into table t999;
 drop table t999;
 insert into t4 values (1);