bk commit into 5.1 tree (ramil:1.2334)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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, 2006-10-03 08:51:59+05:00, ramil@stripped +2 -0
  Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
  into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
  MERGE: 1.1810.2123.2

  mysql-test/r/type_bit.result@stripped, 2006-10-03 08:51:53+05:00, ramil@stripped
+0 -0
    Auto merged
    MERGE: 1.14.1.4

  sql/field.cc@stripped, 2006-10-03 08:51:53+05:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.256.1.68

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug22271/my51-bug22271/RESYNC

--- 1.342/sql/field.cc	2006-10-03 08:52:07 +05:00
+++ 1.343/sql/field.cc	2006-10-03 08:52:07 +05:00
@@ -8163,7 +8163,7 @@ int Field_bit::store(const char *from, u
       (delta == -1 && (uchar) *from > ((1 << bit_len) - 1)) ||
       (!bit_len && delta < 0))
   {
-    set_rec_bits(0xff, bit_ptr, bit_ofs, bit_len);
+    set_rec_bits((1 << bit_len) - 1, bit_ptr, bit_ofs, bit_len);
     memset(ptr, 0xff, bytes_in_rec);
     if (table->in_use->really_abort_on_warning())
       set_warning(MYSQL_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);

--- 1.20/mysql-test/r/type_bit.result	2006-10-03 08:52:07 +05:00
+++ 1.21/mysql-test/r/type_bit.result	2006-10-03 08:52:07 +05:00
@@ -602,4 +602,12 @@ NULL	NULL
 0	0
 11111111	11111111
 drop table bug15583;
+create table t1(a bit(1), b smallint unsigned);
+insert into t1 (b, a) values ('2', '1');
+Warnings:
+Warning	1264	Out of range value adjusted for column 'a' at row 1
+select hex(a), b from t1;
+hex(a)	b
+1	2
+drop table t1;
 End of 5.0 tests