bk commit into 5.0 tree (guilhem:1.1974) BUG#14703

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1974 05/11/07 16:18:46 guilhem@stripped +3 -0
  Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
  test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
  I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
  decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).

  sql/field.cc
    1.289 05/11/07 16:18:31 guilhem@stripped +2 -2
    To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).

  mysql-test/r/read_only.result
    1.2 05/11/07 16:18:31 guilhem@stripped +2 -0
    result update

  BUILD/compile-pentium64-valgrind-max
    1.2 05/11/07 16:18:31 guilhem@stripped +2 -2
    putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0

--- 1.288/sql/field.cc	2005-11-01 02:06:56 +01:00
+++ 1.289/sql/field.cc	2005-11-07 16:18:31 +01:00
@@ -7931,7 +7931,7 @@
 {
   int delta;
 
-  for (; !*from && length; from++, length--);          // skip left 0's
+  for (; length && !*from; from++, length--);          // skip left 0's
   delta= field_length - length;
 
   if (delta < -1 ||
@@ -8151,7 +8151,7 @@
   int delta;
   uchar bits= create_length & 7;
 
-  for (; !*from && length; from++, length--);          // skip left 0's
+  for (; length && !*from; from++, length--);          // skip left 0's
   delta= field_length - length;
 
   if (delta < 0 ||

--- 1.1/BUILD/compile-pentium64-valgrind-max	2005-10-04 22:24:01 +02:00
+++ 1.2/BUILD/compile-pentium64-valgrind-max	2005-11-07 16:18:31 +01:00
@@ -3,13 +3,13 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium64_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium64_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
 
 . "$path/FINISH.sh"
 

--- 1.1/mysql-test/r/read_only.result	2005-10-17 10:52:22 +02:00
+++ 1.2/mysql-test/r/read_only.result	2005-11-07 16:18:31 +01:00
@@ -14,6 +14,8 @@
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 insert into t1 values(1);
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+update t1 set a=1 where 1=0;
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 update t1,t2 set t1.a=t2.a+1 where t1.a=t2.a;
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 delete t1,t2 from t1,t2 where t1.a=t2.a;