Commit 36a27948 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 

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


storage/myisam/mi_open.c:
  Use local.
parents 8a140cb7 fa6eef5a

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/r/gis-rtree.result

+552 −0

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/heap.result

+7 −0
Original line number Diff line number Diff line
@@ -731,3 +731,10 @@ SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256); 
COUNT(*)

2

DROP TABLE t1;

CREATE TABLE t1(c1 VARCHAR(100), c2 INT) ENGINE=MEMORY;

INSERT INTO t1 VALUES('', 0);

ALTER TABLE t1 MODIFY c1 VARCHAR(101);

SELECT c2 FROM t1;

c2

0

DROP TABLE t1;

mysql-test/r/merge.result

+5 −0
Original line number Diff line number Diff line
@@ -806,6 +806,11 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1); 
SELECT * FROM tm1;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

DROP TABLE t1, tm1;

CREATE TABLE t1(c1 INT) ENGINE=MyISAM;

CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);

INSERT DELAYED INTO t2 VALUES(1);

ERROR HY000: Table storage engine for 't2' doesn't have this option

DROP TABLE t1, t2;

create table t1 (b bit(1));

create table t2 (b bit(1));

create table tm (b bit(1)) engine = merge union = (t1,t2);

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;