bk commit into 5.1 tree (ramil:1.2401)

[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, 2007-01-18 15:59:40+04:00, ramil@stripped +4 -0
  Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
  into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
  MERGE: 1.1810.2320.22

  mysql-test/r/range.result@stripped, 2007-01-18 15:59:33+04:00, ramil@stripped +0
-0
    Auto merged
    MERGE: 1.44.1.8

  mysql-test/r/type_bit.result@stripped, 2007-01-18 15:59:33+04:00, ramil@stripped
+0 -0
    Auto merged
    MERGE: 1.14.1.5

  mysql-test/r/type_bit_innodb.result@stripped, 2007-01-18 15:59:33+04:00,
ramil@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.3

  sql/field.cc@stripped, 2007-01-18 15:59:34+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.256.34.1

# 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/bug22533/my51-bug22533/RESYNC

--- 1.352/sql/field.cc	2007-01-18 15:59:51 +04:00
+++ 1.353/sql/field.cc	2007-01-18 15:59:51 +04:00
@@ -8166,6 +8166,7 @@ Field_bit::Field_bit(char *ptr_arg, uint
     bit_ptr(bit_ptr_arg), bit_ofs(bit_ofs_arg), bit_len(len_arg & 7),
     bytes_in_rec(len_arg / 8)
 {
+  flags|= UNSIGNED_FLAG;
   /*
     Ensure that Field::eq() can distinguish between two different bit fields.
     (two bit fields that are not null, may have same ptr and null_ptr)
@@ -8472,6 +8473,7 @@ Field_bit_as_char::Field_bit_as_char(cha
   :Field_bit(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, 0, 0,
              unireg_check_arg, field_name_arg)
 {
+  flags|= UNSIGNED_FLAG;
   bit_len= 0;
   bytes_in_rec= (len_arg + 7) / 8;
 }

--- 1.51/mysql-test/r/range.result	2007-01-18 15:59:51 +04:00
+++ 1.52/mysql-test/r/range.result	2007-01-18 15:59:51 +04:00
@@ -521,8 +521,8 @@ select count(*) from t1 where x = 184467
 count(*)
 1
 create table t2 (x bigint not null);
-insert into t2(x) values (cast(0xfffffffffffffff0+0 as signed));
-insert into t2(x) values (cast(0xfffffffffffffff1+0 as signed));
+insert into t2(x) values (-16);
+insert into t2(x) values (-15);
 select * from t2;
 x
 -16

--- 1.22/mysql-test/r/type_bit.result	2007-01-18 15:59:51 +04:00
+++ 1.23/mysql-test/r/type_bit.result	2007-01-18 15:59:51 +04:00
@@ -568,7 +568,7 @@ create table t1 (a bit(7));
 insert into t1 values (0x60);
 select * from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max
length	Is_null	Flags	Decimals	Charsetnr
-def	test	t1	t1	a	a	16	7	1	Y	0	0	63
+def	test	t1	t1	a	a	16	7	1	Y	32	0	63
 a
 `
 drop table t1;

--- 1.9/mysql-test/r/type_bit_innodb.result	2007-01-18 15:59:51 +04:00
+++ 1.10/mysql-test/r/type_bit_innodb.result	2007-01-18 15:59:51 +04:00
@@ -406,7 +406,7 @@ create table t1 (a bit(7)) engine=innodb
 insert into t1 values (0x60);
 select * from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max
length	Is_null	Flags	Decimals	Charsetnr
-def	test	t1	t1	a	a	16	7	1	Y	0	0	63
+def	test	t1	t1	a	a	16	7	1	Y	32	0	63
 a
 `
 drop table t1;