From 6f06cef02b062f240806cad555275c54fd68eba6 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 13 Mar 2012 16:38:43 +0200 Subject: Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" Added 'from_end' as extra parameter to Field::unpack() to detect wrong from data. Change ha_archive::unpack_row() to detect wrong field lengths. Replication code changed to detect wrong field information in events. mysql-test/r/archive.result: dded test case for lp:917689 sql/field.cc: Added 'from_end' as extra parameter to Field::unpack() to detect wrong from data. Removed not used 'unpack_key' functions. sql/field.h: Added 'from_end' as extra parameter to Field::unpack() to detect wrong from data. Removed not used 'unpack_key' functions. Removed some not needed unpack() functions. sql/filesort.cc: Added buffer end parameter to unpack_addon_fields() sql/log_event.h: Added end of buffer argument to unpack_row() sql/log_event_old.cc: Added end of buffer argument to unpack_row() sql/log_event_old.h: Added end of buffer argument to unpack_row() sql/records.cc: Added buffer end parameter to unpack_addon_fields() sql/rpl_record.cc: Added end of buffer argument to unpack_row() Added detection of wrong field information in events sql/rpl_record.h: Added end of buffer argument to unpack_row() sql/rpl_record_old.cc: Added end of buffer argument to unpack_row() Added detection of wrong field information in events sql/rpl_record_old.h: Added end of buffer argument to unpack_row() sql/table.h: Added buffer end parameter to unpack() storage/archive/ha_archive.cc: Change ha_archive::unpack_row() to detect wrong field lengths. This fixes lp:917689 --- mysql-test/t/archive.test | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mysql-test/t/archive.test') diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index 6f788fc3cc6..0f274b6225d 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1727,3 +1727,14 @@ CHECKSUM TABLE t1 EXTENDED; FLUSH TABLE t1; OPTIMIZE TABLE t1; DROP TABLE t1; + +--echo # +--echo # BUG#917689 Using wrong archive table causes crash +--echo # +create table t1 (a int, b char(50)) engine=archive; +--remove_file $MYSQLD_DATADIR/test/t1.ARZ +copy_file std_data/t917689.ARZ $MYSQLD_DATADIR/test/t1.ARZ; +--error 1194 +select * from t1; +show warnings; +drop table t1; -- cgit v1.2.1