merge into an updated 5.1-bugteam tree

		 )) or

                # Test case for Bug#31590 produces the following error:

                /Out of sort memory; increase server sort buffer size/

                /Out of sort memory; increase server sort buffer size/ or

                # Bug#35161, test of auto repair --myisam-recover

                /able.*_will_crash/

		)

            {

              next;                       # Skip these lines

CREATE TABLE t1_will_crash (a INT, KEY (a)) ENGINE=MyISAM;

INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11);

FLUSH TABLES;

# replacing t1.MYI with a corrupt + unclosed one created by doing:

# 'create table t1 (a int key(a))' head -c1024 t1.MYI > corrupt_t1.MYI 

SELECT * FROM t1_will_crash;

a

1

2

3

4

5

6

7

8

9

10

11

Warnings:

Error	145	Table './test/t1_will_crash' is marked as crashed and should be repaired

Error	1194	Table 't1_will_crash' is marked as crashed and should be repaired

Error	1034	1 client is using or hasn't closed the table properly

Error	1034	Size of indexfile is: 1024        Should be: 2048

Error	1034	Size of datafile is: 77       Should be: 7

Error	1034	Number of rows changed from 1 to 11

DROP TABLE t1_will_crash;

CREATE TABLE t1_will_crash (a INT, KEY (a))

ENGINE=MyISAM

PARTITION BY HASH(a)

PARTITIONS 3;

INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11);

FLUSH TABLES;

# replacing t1#P#p1.MYI with a corrupt + unclosed one created by doing:

# 'create table t1 (a int key(a)) partition by hash (a) partitions 3'

# head -c1024 t1#P#p1.MYI > corrupt_t1#P#p1.MYI 

SELECT * FROM t1_will_crash;

a

1

2

3

4

5

6

7

8

9

10

11

Warnings:

Error	145	Table './test/t1_will_crash#P#p1' is marked as crashed and should be repaired

Error	1194	Table 't1_will_crash' is marked as crashed and should be repaired

Error	1034	1 client is using or hasn't closed the table properly

Error	1034	Size of indexfile is: 1024        Should be: 2048

Error	1034	Size of datafile is: 28       Should be: 7

Error	1034	Number of rows changed from 1 to 4

DROP TABLE t1_will_crash;

--myisam-recover