auto-merge

mysql-test/r/archive.result

@@ -12695,22 +12695,3 @@ a	b
 1	NULL
 2	NULL
 DROP TABLE t1;
-#
-# BUG#32880 - Repairing Archive table fails with internal error 144
-#
-
-# Test with an existing table which is corrupted
-# Copy t1 from std_data
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL,
-  `b` blob
-) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-CHECK TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	error	Corrupt
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	error	Corrupt
-DROP TABLE t1;

mysql-test/suite/funcs_1/r/processlist_priv_ps.result

@@ -27,7 +27,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `HOST` varchar(64) NOT NULL DEFAULT '',
   `DB` varchar(64) DEFAULT NULL,
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -97,7 +97,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `HOST` varchar(64) NOT NULL DEFAULT '',
   `DB` varchar(64) DEFAULT NULL,
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8

mysql-test/suite/funcs_1/r/processlist_val_ps.result

@@ -17,7 +17,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `HOST` varchar(64) NOT NULL DEFAULT '',
   `DB` varchar(64) DEFAULT NULL,
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
-  `TIME` bigint(7) NOT NULL DEFAULT '0',
+  `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8

mysql-test/suite/rpl/r/rpl_loadfile.result

@@ -233,7 +233,7 @@ include/start_slave.inc
 SELECT repeat('x',20) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_39701.data';
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (t text);
-CREATE PROCEDURE p(file TEXT) 
+CREATE PROCEDURE p(file varchar(4096)) 
 BEGIN
 INSERT INTO t1 VALUES (LOAD_FILE(file));
 END|

mysql-test/suite/rpl/t/rpl_loadfile.test

@@ -73,7 +73,7 @@ enable_warnings;
 
 CREATE TABLE t1 (t text);
 DELIMITER |;
-CREATE PROCEDURE p(file TEXT) 
+CREATE PROCEDURE p(file varchar(4096)) 
   BEGIN
     INSERT INTO t1 VALUES (LOAD_FILE(file));
   END|

mysql-test/t/archive.test

@@ -1599,18 +1599,3 @@ INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL);
 FLUSH TABLE t1;
 SELECT * FROM t1 ORDER BY a;
 DROP TABLE t1;
-
---echo #
---echo # BUG#32880 - Repairing Archive table fails with internal error 144
---echo #
---echo 
---echo # Test with an existing table which is corrupted
---echo # Copy t1 from std_data
-let $MYSQLD_DATADIR= `select @@datadir`;
-copy_file std_data/bug32880.frm $MYSQLD_DATADIR/test/t1.frm;
-copy_file std_data/bug32880.ARZ $MYSQLD_DATADIR/test/t1.ARZ;
-copy_file std_data/bug32880.ARN $MYSQLD_DATADIR/test/t1.ARN;
-SHOW CREATE TABLE t1;
-CHECK TABLE t1;
-REPAIR TABLE t1;
-DROP TABLE t1;

mysql-test/t/upgrade.test

@@ -53,7 +53,9 @@ drop table `txu#p#p1`;
 #
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLD_DATADIR/test/t1.frm;
+--error 0,1
+--remove_file $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/old_table-323.frm $MYSQLD_DATADIR/test/t1.frm
 truncate t1;
 drop table t1;
 

storage/archive/ha_archive.cc

@@ -1071,7 +1071,11 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record)
   row_len=  uint4korr(size_buffer);
   DBUG_PRINT("ha_archive",("Unpack row length %u -> %u", row_len, 
                            (unsigned int)table->s->reclength));
-  fix_rec_buff(row_len);
+
+  if (fix_rec_buff(row_len))
+  {
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+  }
   DBUG_ASSERT(row_len <= record_buffer->length);
 
   read= azread(file_to_read, record_buffer->buffer, row_len, &error);