From e7e49eb69ee6ca949d8f885505da572bb1d394c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 May 2008 21:01:13 +0500 Subject: Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables The REPAIR TABLE ... USE_FRM query silently corrupts data of tables with old .FRM file version. The mysql_upgrade client program or the REPAIR TABLE query (without the USE_FRM clause) can't prevent this trouble, because in the common case they don't upgrade .FRM file to compatible structure. 1. Evaluation of the REPAIR TABLE ... USE_FRM query has been modified to reject such tables with the message: "Failed repairing incompatible .FRM file". 2. REPAIR TABLE query (without USE_FRM clause) evaluation has been modified to upgrade .FRM files to current version. 3. CHECK TABLE ... FOR UPGRADE query evaluation has been modified to return error status when .FRM file has incompatible version. 4. mysql_upgrade and mysqlcheck client programs call CHECK TABLE FOR UPGRADE and REPAIR TABLE queries, so their behaviors have been changed too to upgrade .FRM files with incompatible version numbers. mysql-test/std_data/bug36055.MYD: Added test data for bug #36055. mysql-test/std_data/bug36055.MYI: Added test data for bug #36055. mysql-test/std_data/bug36055.frm: Added test data for bug #36055. mysql-test/r/repair.result: Added test case for bug# 36055. mysql-test/t/repair.test: Added test case for bug# 36055. sql/handler.cc: Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables The handler::ha_check_for_upgrade method has been modified to return error if .FRM file has incompatible version number. sql/sql_table.cc: Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables The prepare_for_repair function has been modified to reject REPAIR TABLE ... USE_FRM queries on incompatible .FRM files with the message: "Failed repairing incompatible .FRM file". --- mysql-test/std_data/bug36055.MYD | Bin 0 -> 10 bytes mysql-test/std_data/bug36055.MYI | Bin 0 -> 1024 bytes mysql-test/std_data/bug36055.frm | Bin 0 -> 8556 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mysql-test/std_data/bug36055.MYD create mode 100644 mysql-test/std_data/bug36055.MYI create mode 100644 mysql-test/std_data/bug36055.frm (limited to 'mysql-test/std_data') diff --git a/mysql-test/std_data/bug36055.MYD b/mysql-test/std_data/bug36055.MYD new file mode 100644 index 00000000000..4932a077113 Binary files /dev/null and b/mysql-test/std_data/bug36055.MYD differ diff --git a/mysql-test/std_data/bug36055.MYI b/mysql-test/std_data/bug36055.MYI new file mode 100644 index 00000000000..531c505c102 Binary files /dev/null and b/mysql-test/std_data/bug36055.MYI differ diff --git a/mysql-test/std_data/bug36055.frm b/mysql-test/std_data/bug36055.frm new file mode 100644 index 00000000000..11c9cb31dad Binary files /dev/null and b/mysql-test/std_data/bug36055.frm differ -- cgit v1.2.1