summaryrefslogtreecommitdiff
path: root/os2
diff options
context:
space:
mode:
Diffstat (limited to 'os2')
-rw-r--r--os2/ChangeLog.os23
-rw-r--r--os2/MySQL-Source.icc24
-rw-r--r--os2/MySQL-Sql.icc2
-rw-r--r--os2/MySQL-Util.icc12
4 files changed, 3 insertions, 38 deletions
diff --git a/os2/ChangeLog.os2 b/os2/ChangeLog.os2
index 7957906ad7d..18356b840ed 100644
--- a/os2/ChangeLog.os2
+++ b/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
diff --git a/os2/MySQL-Source.icc b/os2/MySQL-Source.icc
index a2e1916beb8..342cb6c96b9 100644
--- a/os2/MySQL-Source.icc
+++ b/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",
diff --git a/os2/MySQL-Sql.icc b/os2/MySQL-Sql.icc
index c1256d5e39e..7c8c61fe7de 100644
--- a/os2/MySQL-Sql.icc
+++ b/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
diff --git a/os2/MySQL-Util.icc b/os2/MySQL-Util.icc
index 36fd499e520..8eaee41b6a2 100644
--- a/os2/MySQL-Util.icc
+++ b/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