Many files:

Removed references to ISAM and MERGE

netware/BUILD/compile-linux-tools

@@ -36,8 +36,6 @@ make clean all-local
 (cd heap; make libheap.a)
 (cd vio; make libvio.a)
 (cd regex; make libregex.a)
-(cd isam; make libnisam.a)
-(cd merge; make libmerge.a)
 (cd myisam; make libmyisam.a)
 (cd myisammrg; make libmyisammrg.a)
 (cd extra; make comp_err)

netware/Makefile.am

@@ -32,8 +32,6 @@ netware_build_files =           client/mysql.def client/mysqladmin.def \
                                 extra/mysql_install.def extra/my_print_defaults.def \
                                 extra/perror.def extra/replace.def \
                                 extra/resolveip.def extra/comp_err.def \
-				isam/isamchk.def \
-                                isam/isamlog.def isam/pack_isam.def \
                                 libmysqld/libmysqld.def myisam/myisamchk.def \
                                 myisam/myisamlog.def myisam/myisampack.def \
                                 sql/mysqld.def extra/mysql_waitpid.def \
@@ -48,7 +46,7 @@ link_sources:
 	done;
 else
 EXTRA_DIST=	comp_err.def init_db.sql install_test_db.ncf \
-		isamchk.def isamlog.def libmysql.def libmysql.imp \
+		libmysql.def libmysql.imp \
 		libmysqlmain.c my_manage.c my_manage.h \
 		my_print_defaults.def myisam_ftdump.def myisamchk.def \
 		myisamlog.def myisampack.def mysql.def mysql.xdc \
@@ -58,7 +56,7 @@ EXTRA_DIST=	comp_err.def init_db.sql install_test_db.ncf \
 		mysql_test_run.def mysql_waitpid.def mysqladmin.def \
 		mysqlbinlog.def mysqlcheck.def mysqld.def \
 		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
-		mysqlshow.def mysqltest.def pack_isam.def perror.def \
+		mysqlshow.def mysqltest.def perror.def \
 		replace.def resolve_stack_dump.def resolveip.def test_db.sql \
 		static_init_db.sql \
 		BUILD/apply-patch BUILD/compile-AUTOTOOLS \

os2/ChangeLog.os2

@@ -1,5 +1,8 @@
 
 
+2005/01/01
+	- removed references to ISAM and MERGE
+
 2002/05/02
 	- now libinit is automatically called on client dll startup
 

os2/MySQL-Source.icc

@@ -84,8 +84,6 @@ group sql =
                "..\\sql\\field_conv.cc",
                "..\\sql\\filesort.cc",
                "..\\sql\\ha_heap.cc",
-               "..\\sql\\ha_isam.cc",
-               "..\\sql\\ha_isammrg.cc",
                "..\\sql\\ha_myisam.cc",
                "..\\sql\\ha_myisammrg.cc",
                "..\\sql\\handler.cc",
@@ -151,21 +149,6 @@ group sql =
                "..\\sql\\unireg.cc",
                "..\\sql\\violite.c"
 
-group isam =
-                      "..\\isam\\changed.c", "..\\isam\\close.c",
-                      "..\\isam\\create.c", "..\\isam\\delete.c", "..\\isam\\extra.c",
-                      "..\\isam\\info.c", "..\\isam\\log.c", "..\\isam\\open.c",
-                      "..\\isam\\panic.c", "..\\isam\\range.c",
-                      "..\\isam\\rfirst.c", "..\\isam\\rkey.c", "..\\isam\\rlast.c",
-                      "..\\isam\\rnext.c", "..\\isam\\rprev.c", "..\\isam\\rrnd.c",
-                      "..\\isam\\rsame.c", "..\\isam\\rsamepos.c",
-                      "..\\isam\\static.c", "..\\isam\\update.c",
-                      "..\\isam\\write.c", "..\\isam\\_cache.c",
-                      "..\\isam\\_dbug.c", "..\\isam\\_dynrec.c",
-                      "..\\isam\\_key.c", "..\\isam\\_locking.c",
-                      "..\\isam\\_packrec.c", "..\\isam\\_page.c",
-                      "..\\isam\\_search.c", "..\\isam\\_statrec.c"
-
 group strings =
                "..\\strings\\bchange.c",
                "..\\strings\\bmove.c",
@@ -214,13 +197,6 @@ group strings =
                 "..\\heap\\hp_write.c", "..\\heap\\_check.c", "..\\heap\\_rectest.c"
 
 
-   group merge = "..\\merge\\close.c", "..\\merge\\create.c", "..\\merge\\delete.c",
-                 "..\\merge\\extra.c", "..\\merge\\info.c", "..\\merge\\open.c",
-                 "..\\merge\\panic.c", "..\\merge\\rrnd.c", "..\\merge\\rsame.c",
-                 "..\\merge\\static.c", "..\\merge\\update.c",
-                 "..\\merge\\_locking.c"
-
-
    group myisammrg = "..\\myisammrg\\myrg_close.c",
                      "..\\myisammrg\\myrg_create.c", "..\\myisammrg\\myrg_delete.c",
                      "..\\myisammrg\\myrg_extra.c", "..\\myisammrg\\myrg_info.c",

os2/MySQL-Sql.icc

@@ -30,8 +30,6 @@ option ProjectOptions = MySQLOptions
             source type('cpp') dbug
          }
          source type('cpp') heap
-         source type('cpp') isam
-         source type('cpp') merge
          source type('cpp') myisam
          source type('cpp') myisammrg
          source type('cpp') my_sys

os2/MySQL-Util.icc

@@ -25,10 +25,8 @@ option ProjectOptions = MySQLOptions
             source type('cpp') dbug
          }
          source type('cpp') heap
-         source type('cpp') merge
          source type('cpp') myisam
          source type('cpp') myisammrg
-         source type('cpp') isam
          source type('cpp') my_sys
          source type('cpp') my_sys_cli
          source type('cpp') my_sys_sql
@@ -89,16 +87,6 @@ option ProjectOptions = MySQLOptions
          source type('cpp') "..\\sql\\gen_lex_hash.cc"
       }
 
-      target "..\\bin\\test\\is_test1.exe"
-      {
-         // target source files
-         source type('cpp') "..\\isam\\test1.c"
-      }
-      target "..\\bin\\test\\is_test2.exe"
-      {
-         // target source files
-         source type('cpp') "..\\isam\\test2.c"
-      }
       target "..\\bin\\test\\mi_test1.exe"
       {
          // target source files

support-files/debian/gomi

@@ -2,8 +2,6 @@ Docs/Makefile
 dbug/Makefile
 extra/Makefile
 heap/Makefile
-isam/Makefile
-merge/Makefile
 mysys/Makefile
 readline/Makefile
 regex/Makefile