bk commit into 5.0 tree (msvensson:1.2410)

[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-13 09:56:56+01:00, msvensson@stripped +4 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2877.49

  BitKeeper/etc/gone@stripped, 2007-02-13 09:56:50+01:00, msvensson@stripped +1 -1
    auto-union
    MERGE: 1.92.1.3

  mysys/my_getopt.c@stripped, 2007-02-13 09:56:54+01:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.50.1.3

  sql/sql_prepare.cc@stripped, 2007-02-13 09:56:54+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.34.36.6

  sql/table.cc@stripped, 2007-02-13 09:56:54+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.111.4.11

# 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.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.106/BitKeeper/etc/gone	2005-05-24 00:31:12 +02:00
+++ 1.107/BitKeeper/etc/gone	2007-02-13 09:56:50 +01:00
@@ -456,6 +456,12 @@
 ccarkner@stripped|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9
 ccarkner@stripped|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456
 fs
+jani@stripped|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54
+jani@stripped|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83
+jani@stripped|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af
+jani@stripped|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16
+jani@stripped|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966
+jani@stripped|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3
 jani@stripped|client/mysqlcheck|20010419221207|26716|363e3278166d84ec
 jcole@stripped|BitKeeper/etc/logging_ok|20001004201211|30554
 jimw@stripped|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

--- 1.192/sql/sql_prepare.cc	2007-02-06 15:50:51 +01:00
+++ 1.193/sql/sql_prepare.cc	2007-02-13 09:56:54 +01:00
@@ -2202,7 +2202,7 @@
 
 void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
 {
-  uchar* packet= (uchar*)packet_arg; // gcc 4.0 stgrict-aliasing
+  uchar *packet= (uchar*)packet_arg; // GCC 4.0.1 workaround
   ulong stmt_id= uint4korr(packet);
   ulong flags= (ulong) ((uchar) packet[4]);
   /* Query text for binary, general or slow log, if any of them is open */