Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines

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


mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged

mysql-test/r/archive.result

@@ -12687,3 +12687,10 @@ CREATE TABLE t1(a VARCHAR(510)) ENGINE = ARCHIVE;
 INSERT INTO t1(a) VALUES ('');
 SELECT * FROM t1 ORDER BY a;
 DROP TABLE t1;
+CREATE TABLE t1(a INT NOT NULL AUTO_INCREMENT, b BLOB, KEY(a)) ENGINE=archive;
+INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL);
+FLUSH TABLE t1;
+SELECT * FROM t1 ORDER BY a;
+a	b
+1	NULL
+2	NULL

mysql-test/t/archive.test

@@ -1589,3 +1589,12 @@ SELECT * FROM t1 ORDER BY a;
 --enable_result_log
 
 DROP TABLE t1;
+
+#
+# BUG#31833 -  ORDER BY leads to wrong result when ARCHIVE, BLOB and table
+#              cache is full
+#
+CREATE TABLE t1(a INT NOT NULL AUTO_INCREMENT, b BLOB, KEY(a)) ENGINE=archive;
+INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL);
+FLUSH TABLE t1;
+SELECT * FROM t1 ORDER BY a;

storage/archive/azio.c

@@ -262,7 +262,7 @@ void check_header(azio_stream *s)
     if (len) s->inbuf[0] = s->stream.next_in[0];
     errno = 0;
     len = (uInt)my_read(s->file, (uchar *)s->inbuf + len, AZ_BUFSIZE_READ >> len, MYF(0));
-    if (len == 0) s->z_err = Z_ERRNO;
+    if (len == (uInt)-1) s->z_err = Z_ERRNO;
     s->stream.avail_in += len;
     s->stream.next_in = s->inbuf;
     if (s->stream.avail_in < 2) {