bk commit into 5.0 tree (svoj:1.2486) BUG#26138

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-29 00:13:59+05:00, svoj@stripped +3 -0
  BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in
              ARCHIVE table
  
  ARCHIVE table is truncated by REPAIR TABLE ... USE_FRM statement.
  This is fixed by reodering ARCHIVE engine extentions array, so now
  REPAIR TABLE ... USE_FRM works well with ARCHIVE tables.

  mysql-test/r/archive.result@stripped, 2007-03-29 00:13:57+05:00, svoj@stripped +9 -0
    A test case for bug#26138.

  mysql-test/t/archive.test@stripped, 2007-03-29 00:13:57+05:00, svoj@stripped +10 -0
    A test case for bug#26138.

  sql/ha_archive.cc@stripped, 2007-03-29 00:13:57+05:00, svoj@stripped +1 -1
    First element of engine base extentions array should be meta/index
    file extention. Second element - data file extention. This is true
    for engines that have separate meta/index file and data file.
    
    Reoder ha_archive_exts elements to meet described above requirement.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines

--- 1.16/mysql-test/r/archive.result	2007-03-29 00:14:04 +05:00
+++ 1.17/mysql-test/r/archive.result	2007-03-29 00:14:04 +05:00
@@ -12355,3 +12355,12 @@ auto	fld1	companynr	fld3	fld4	fld5
 4	011403	37	intercepted	audiology	tinily
 4	011403	37	intercepted	audiology	tinily
 drop table t1, t2, t4;
+create table t1 (i int) engine=archive;
+insert into t1 values (1);
+repair table t1 use_frm;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+select * from t1;
+i
+1
+drop table t1;

--- 1.17/mysql-test/t/archive.test	2007-03-29 00:14:04 +05:00
+++ 1.18/mysql-test/t/archive.test	2007-03-29 00:14:04 +05:00
@@ -1364,3 +1364,13 @@ SELECT * from t2;
 
 
 drop table t1, t2, t4;
+
+#
+# BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in ARCHIVE
+#             table
+#
+create table t1 (i int) engine=archive;
+insert into t1 values (1);
+repair table t1 use_frm;
+select * from t1;
+drop table t1;

--- 1.83/sql/ha_archive.cc	2007-03-29 00:14:04 +05:00
+++ 1.84/sql/ha_archive.cc	2007-03-29 00:14:04 +05:00
@@ -503,8 +503,8 @@ int ha_archive::init_archive_writer()
   We just implement one additional file extension.
 */
 static const char *ha_archive_exts[] = {
-  ARZ,
   ARM,
+  ARZ,
   NullS
 };