Commit 8bf49833 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG26238/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG26238/mysql-5.1-engines


mysql-test/r/delayed.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
sql/field.h:
  Use local.
parents d235a559 af44be2d

mysql-test/r/delayed.result

+7 −0
Original line number Diff line number Diff line
@@ -243,3 +243,10 @@ SET @@session.auto_increment_offset= 
@bug20830_old_session_auto_increment_offset;

SET             @@session.auto_increment_increment=

@bug20830_old_session_auto_increment_increment;

CREATE TABLE t1(a BIT);

INSERT DELAYED INTO t1 VALUES(1);

FLUSH TABLE t1;

SELECT HEX(a) FROM t1;

HEX(a)

1

DROP TABLE t1;

mysql-test/t/delayed.test

+8 −0
Original line number Diff line number Diff line
@@ -234,3 +234,11 @@ SET @@session.auto_increment_offset= 
SET             @@session.auto_increment_increment=

    @bug20830_old_session_auto_increment_increment;



#

# BUG#26238 - inserted delayed always inserts 0 for BIT columns

#

CREATE TABLE t1(a BIT);

INSERT DELAYED INTO t1 VALUES(1);

FLUSH TABLE t1;

SELECT HEX(a) FROM t1;

DROP TABLE t1;